diff mbox

[nft] datatype: fix output of time type

Message ID 1389906887-27919-1-git-send-email-pablo@netfilter.org
State Not Applicable
Headers show

Commit Message

Pablo Neira Ayuso Jan. 16, 2014, 9:14 p.m. UTC 
Display output in seconds, which is what we get as input.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 src/datatype.c |   31 +------------------------------
 1 file changed, 1 insertion(+), 30 deletions(-)
diff mbox

Patch

diff --git a/src/datatype.c b/src/datatype.c
index 4594490..b8f6ca9 100644
--- a/src/datatype.c
+++ b/src/datatype.c
@@ -669,36 +669,7 @@  const struct datatype mark_type = {
 
 static void time_type_print(const struct expr *expr)
 {
-	uint64_t days, hours, minutes, seconds;
-	const char *delim = "";
-
-	seconds = mpz_get_uint64(expr->value);
-
-	days = seconds / 86400;
-	seconds %= 86400;
-
-	hours = seconds / 3600;
-	seconds %= 3600;
-
-	minutes = seconds / 60;
-	seconds %= 60;
-
-	if (days > 0) {
-		printf("%s%" PRIu64 " d", delim, days);
-		delim = " ";
-	}
-	if (hours > 0) {
-		printf("%s%" PRIu64 " h", delim, hours);
-		delim = " ";
-	}
-	if (minutes > 0) {
-		printf("%s%" PRIu64 " min", delim, minutes);
-		delim = " ";
-	}
-	if (seconds > 0) {
-		printf("%s%" PRIu64 " s", delim, seconds);
-		delim = " ";
-	}
+	printf("%"PRIu64"", mpz_get_uint64(expr->value));
 }
 
 const struct datatype time_type = {