Module Name: src
Committed By: martin
Date: Tue Jan 31 08:43:45 UTC 2012
Modified Files:
src/dist/ipf/lib: printactivenat.c printaps.c
Log Message:
Fix printf formats (those who can't decide wether to use casts or PRI*
macros do both in bogus combination)
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 src/dist/ipf/lib/printactivenat.c
cvs rdiff -u -r1.1.1.3 -r1.2 src/dist/ipf/lib/printaps.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/dist/ipf/lib/printactivenat.c
diff -u src/dist/ipf/lib/printactivenat.c:1.1.1.4 src/dist/ipf/lib/printactivenat.c:1.2
--- src/dist/ipf/lib/printactivenat.c:1.1.1.4 Mon Jan 30 16:03:22 2012
+++ src/dist/ipf/lib/printactivenat.c Tue Jan 31 08:43:44 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: printactivenat.c,v 1.1.1.4 2012/01/30 16:03:22 darrenr Exp $ */
+/* $NetBSD: printactivenat.c,v 1.2 2012/01/31 08:43:44 martin Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -113,7 +113,7 @@ printactivenat(nat, opts, ticks)
PRINTF("\tifp %s", getifname(nat->nat_ifps[0]));
PRINTF(",%s ", getifname(nat->nat_ifps[1]));
#ifdef USE_QUAD_T
- PRINTF("bytes %"PRIu64"/%"PRIu64" pkts %"PRIu64"/%"PRIu64"",
+ PRINTF("bytes %llu/%llu pkts %llu/%llu",
(unsigned long long)nat->nat_bytes[0],
(unsigned long long)nat->nat_bytes[1],
(unsigned long long)nat->nat_pkts[0],
Index: src/dist/ipf/lib/printaps.c
diff -u src/dist/ipf/lib/printaps.c:1.1.1.3 src/dist/ipf/lib/printaps.c:1.2
--- src/dist/ipf/lib/printaps.c:1.1.1.3 Mon Jan 30 16:03:22 2012
+++ src/dist/ipf/lib/printaps.c Tue Jan 31 08:43:44 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: printaps.c,v 1.1.1.3 2012/01/30 16:03:22 darrenr Exp $ */
+/* $NetBSD: printaps.c,v 1.2 2012/01/31 08:43:44 martin Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -35,7 +35,7 @@ printaps(aps, opts, proto)
PRINTF("\tproxy %s/%d use %d flags %x\n", apr.apr_label,
apr.apr_p, apr.apr_ref, apr.apr_flags);
#ifdef USE_QUAD_T
- PRINTF("%"PRIu64" pkts %"PRIu64"", (unsigned long long)ap.aps_bytes,
+ PRINTF("%llu pkts %llu", (unsigned long long)ap.aps_bytes,
(unsigned long long)ap.aps_pkts);
#else
PRINTF("%lu pkts %lu", ap.aps_bytes, ap.aps_pkts);
