[src/trunk]: src/external/bsd/libpcap avoid/document non-literal format strings

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/04a056f10a2d
branches:  trunk
changeset: 768408:04a056f10a2d
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Aug 16 10:34:22 2011 +0000

description:
avoid/document non-literal format strings

diffstat:

 external/bsd/libpcap/dist/optimize.c |  2 +-
 external/bsd/libpcap/lib/Makefile    |  3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diffs (28 lines):

diff -r b47669310e32 -r 04a056f10a2d external/bsd/libpcap/dist/optimize.c
--- a/external/bsd/libpcap/dist/optimize.c      Tue Aug 16 10:33:17 2011 +0000
+++ b/external/bsd/libpcap/dist/optimize.c      Tue Aug 16 10:34:22 2011 +0000
@@ -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,
diff -r b47669310e32 -r 04a056f10a2d external/bsd/libpcap/lib/Makefile
--- a/external/bsd/libpcap/lib/Makefile Tue Aug 16 10:33:17 2011 +0000
+++ b/external/bsd/libpcap/lib/Makefile Tue Aug 16 10:34:22 2011 +0000
@@ -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>