diff options
| author | Mr Dash Four <mr.dash.four@googlemail.com> | 2013-03-15 12:03:05 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2013-03-15 12:05:06 +0100 |
| commit | 703c1861c1c487f7bfc210f9f7a43cfca988035f (patch) | |
| tree | 7c51b9bbb0f394e244ff300c916e6bd1de7b3eee | |
| parent | d8575688cc789cd5d27e2e0a6753dbbc1bad1816 (diff) | |
use PRIu64 and remove unnecessary cast
This patch corrects all nfacct_snprintf_* functions to use PRIu64,
given that we are using uint64_t type variables and also removes
the unnecessary casts.
Signed-off-by: Mr Dash Four <mr.dash.four@googlemail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
| -rw-r--r-- | src/libnetfilter_acct.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/libnetfilter_acct.c b/src/libnetfilter_acct.c index 0abaeac..ba89e2d 100644 --- a/src/libnetfilter_acct.c +++ b/src/libnetfilter_acct.c @@ -13,6 +13,7 @@ #include <endian.h> #include <stdlib.h> #include <string.h> +#include <inttypes.h> #include <libmnl/libmnl.h> #include <linux/netfilter/nfnetlink.h> @@ -235,10 +236,8 @@ nfacct_snprintf_plain(char *buf, size_t rem, struct nfacct *nfacct, if (flags & NFACCT_SNPRINTF_F_FULL) { ret = snprintf(buf, rem, - "{ pkts = %.20llu, bytes = %.20llu } = %s;", - (unsigned long long) + "{ pkts = %.20"PRIu64", bytes = %.20"PRIu64" } = %s;", nfacct_attr_get_u64(nfacct, NFACCT_ATTR_PKTS), - (unsigned long long) nfacct_attr_get_u64(nfacct, NFACCT_ATTR_BYTES), nfacct_attr_get_str(nfacct, NFACCT_ATTR_NAME)); } else { @@ -296,12 +295,10 @@ nfacct_snprintf_xml(char *buf, size_t rem, struct nfacct *nfacct, ret = snprintf(buf, rem, "<obj><name>%s</name>" - "<pkts>%.20llu</pkts>" - "<bytes>%.20llu</bytes>", + "<pkts>%.20"PRIu64"</pkts>" + "<bytes>%.20"PRIu64"</bytes>", nfacct_attr_get_str(nfacct, NFACCT_ATTR_NAME), - (unsigned long long) nfacct_attr_get_u64(nfacct, NFACCT_ATTR_BYTES), - (unsigned long long) nfacct_attr_get_u64(nfacct, NFACCT_ATTR_PKTS)); BUFFER_SIZE(ret, size, rem, offset); |