Module Name: src
Committed By: christos
Date: Tue Aug 16 10:34:23 UTC 2011
Modified Files:
src/external/bsd/libpcap/dist: optimize.c
src/external/bsd/libpcap/lib: Makefile
Log Message:
avoid/document non-literal format strings
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libpcap/dist/optimize.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/libpcap/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/libpcap/dist/optimize.c
diff -u src/external/bsd/libpcap/dist/optimize.c:1.2 src/external/bsd/libpcap/dist/optimize.c:1.3
--- src/external/bsd/libpcap/dist/optimize.c:1.2 Sat Dec 4 20:45:46 2010
+++ src/external/bsd/libpcap/dist/optimize.c Tue Aug 16 06:34:22 2011
@@ -2153,7 +2153,7 @@
{
u_int i;
int jt, jf;
- const char *ljerr = "%s for block-local relative jump: off=%d";
+#define ljerr "%s for block-local relative jump: off=%d"
#if 0
printf("code=%x off=%d %x %x\n", src->s.code,
Index: src/external/bsd/libpcap/lib/Makefile
diff -u src/external/bsd/libpcap/lib/Makefile:1.4 src/external/bsd/libpcap/lib/Makefile:1.5
--- src/external/bsd/libpcap/lib/Makefile:1.4 Mon Jul 18 23:07:09 2011
+++ src/external/bsd/libpcap/lib/Makefile Tue Aug 16 06:34:23 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/07/19 03:07:09 dholland Exp $
+# $NetBSD: Makefile,v 1.5 2011/08/16 10:34:23 christos Exp $
.include <bsd.own.mk>
@@ -100,5 +100,6 @@
cp $? $@
CLEANFILES+= tokdefs.h
+COPTS.bpf_image.c = -Wno-format-nonliteral
.include <bsd.lib.mk>