Module Name: src
Committed By: joerg
Date: Wed Feb 29 23:42:29 UTC 2012
Modified Files:
src/dist/pf/sbin/pflogd: pflogd.c pflogd.h
Log Message:
Fix format string usage.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/dist/pf/sbin/pflogd/pflogd.c
cvs rdiff -u -r1.4 -r1.5 src/dist/pf/sbin/pflogd/pflogd.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/dist/pf/sbin/pflogd/pflogd.c
diff -u src/dist/pf/sbin/pflogd/pflogd.c:1.8 src/dist/pf/sbin/pflogd/pflogd.c:1.9
--- src/dist/pf/sbin/pflogd/pflogd.c:1.8 Mon Dec 13 01:45:38 2010
+++ src/dist/pf/sbin/pflogd/pflogd.c Wed Feb 29 23:42:28 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pflogd.c,v 1.8 2010/12/13 01:45:38 christos Exp $ */
+/* $NetBSD: pflogd.c,v 1.9 2012/02/29 23:42:28 joerg Exp $ */
/* $OpenBSD: pflogd.c,v 1.45 2007/06/06 14:11:26 henning Exp $ */
/*
@@ -559,7 +559,7 @@ dump_packet(u_char *user, const struct p
#endif
if (len < sizeof(*h) || h->caplen > (size_t)cur_snaplen) {
- logmsg(LOG_NOTICE, "invalid size %u (%u/%u), packet dropped",
+ logmsg(LOG_NOTICE, "invalid size %zu (%u/%u), packet dropped",
len, cur_snaplen, snaplen);
packets_dropped++;
return;
@@ -770,7 +770,7 @@ main(int argc, char **argv)
logmsg(LOG_WARNING, "Reading stats: %s", pcap_geterr(hpcap));
else
logmsg(LOG_NOTICE,
- "%u packets received, %u/%u dropped (kernel/pflogd)",
+ "%u packets received, %u/%ld dropped (kernel/pflogd)",
pstat.ps_recv, pstat.ps_drop, packets_dropped);
pcap_close(hpcap);
Index: src/dist/pf/sbin/pflogd/pflogd.h
diff -u src/dist/pf/sbin/pflogd/pflogd.h:1.4 src/dist/pf/sbin/pflogd/pflogd.h:1.5
--- src/dist/pf/sbin/pflogd/pflogd.h:1.4 Wed Jun 18 09:06:26 2008
+++ src/dist/pf/sbin/pflogd/pflogd.h Wed Feb 29 23:42:28 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pflogd.h,v 1.4 2008/06/18 09:06:26 yamt Exp $ */
+/* $NetBSD: pflogd.h,v 1.5 2012/02/29 23:42:28 joerg Exp $ */
/* $OpenBSD: pflogd.h,v 1.3 2006/01/15 16:38:04 canacar Exp $ */
/*
@@ -36,7 +36,7 @@
#define PFLOGD_MAXSNAPLEN INT_MAX
#define PFLOGD_BUFSIZE 65536 /* buffer size for incoming packets */
-void logmsg(int priority, const char *message, ...);
+void logmsg(int priority, const char *message, ...) __printflike(2, 3);
/* Privilege separation */
int priv_init(void);
