From a5e394e469f7c3e4e40dd60da2ddc0294f485fdc Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Wed, 10 Oct 2012 13:35:27 +0200 Subject: Partially revert "src: remove unnecessary castings" This partially reverts commit 6e8573c9f62fc9db99c120298d9539be27fe282e. %lu in 32-bits arch is only 4 bytes. Thanks to Jan Engelhardt for spotting this. --- src/libnetfilter_acct.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/libnetfilter_acct.c') diff --git a/src/libnetfilter_acct.c b/src/libnetfilter_acct.c index f4dbf55..6a3a839 100644 --- a/src/libnetfilter_acct.c +++ b/src/libnetfilter_acct.c @@ -235,8 +235,10 @@ nfacct_snprintf_plain(char *buf, size_t rem, struct nfacct *nfacct, if (flags & NFACCT_SNPRINTF_F_FULL) { ret = snprintf(buf, rem, - "{ pkts = %.20lu, bytes = %.20lu } = %s;", + "{ pkts = %.20llu, bytes = %.20llu } = %s;", + (unsigned long long) nfacct_attr_get_u64(nfacct, NFACCT_ATTR_BYTES), + (unsigned long long) nfacct_attr_get_u64(nfacct, NFACCT_ATTR_PKTS), nfacct_attr_get_str(nfacct, NFACCT_ATTR_NAME)); } else { @@ -294,10 +296,12 @@ nfacct_snprintf_xml(char *buf, size_t rem, struct nfacct *nfacct, ret = snprintf(buf, rem, "%s" - "%.20lu" - "%.20lu", + "%.20llu" + "%.20llu", 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); -- cgit v1.2.3