* [PATCH nft] datatype: fix output of time type
@ 2014-01-16 21:14 Pablo Neira Ayuso
0 siblings, 0 replies; only message in thread
From: Pablo Neira Ayuso @ 2014-01-16 21:14 UTC (permalink / raw)
To: netfilter-devel
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 --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 = {
--
1.7.10.4
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2014-01-16 21:15 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-16 21:14 [PATCH nft] datatype: fix output of time type Pablo Neira Ayuso
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).