Module Name: src
Committed By: mrg
Date: Sun Feb 4 08:19:42 UTC 2018
Modified Files:
src/external/bsd/ipf/bin/ipftest: bpf_filter.c
src/external/bsd/ipf/dist: ip_fil.c
src/external/bsd/ipf/dist/ipsend: ip.c ipresend.c ipsend.c ipsopt.c
iptest.c iptests.c resend.c sbpf.c sock.c
src/external/bsd/ipf/dist/lib: facpri.c getnattype.c ipft_hx.c
ipft_pc.c ipft_tx.c kmem.c nat_setgroupmap.c printactiveaddr.c
printactivenat.c printaps.c printnat.c printnataddr.c printproto.c
src/external/bsd/ipf/dist/tools: ipf.c ipfcomp.c ipfs.c ipfstat.c
ipftest.c ipmon.c ipnat.c
src/sys/external/bsd/ipf/netinet: fil.c
Log Message:
apply __attribute__((__used__)) for rcsid, etc.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/ipf/bin/ipftest/bpf_filter.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ipf/dist/ip_fil.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ipf/dist/ipsend/ip.c \
src/external/bsd/ipf/dist/ipsend/sbpf.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ipf/dist/ipsend/ipresend.c \
src/external/bsd/ipf/dist/ipsend/ipsend.c \
src/external/bsd/ipf/dist/ipsend/ipsopt.c \
src/external/bsd/ipf/dist/ipsend/iptest.c \
src/external/bsd/ipf/dist/ipsend/resend.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ipf/dist/ipsend/iptests.c \
src/external/bsd/ipf/dist/ipsend/sock.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ipf/dist/lib/facpri.c \
src/external/bsd/ipf/dist/lib/getnattype.c \
src/external/bsd/ipf/dist/lib/ipft_pc.c \
src/external/bsd/ipf/dist/lib/kmem.c \
src/external/bsd/ipf/dist/lib/nat_setgroupmap.c \
src/external/bsd/ipf/dist/lib/printactiveaddr.c \
src/external/bsd/ipf/dist/lib/printnataddr.c \
src/external/bsd/ipf/dist/lib/printproto.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ipf/dist/lib/ipft_hx.c \
src/external/bsd/ipf/dist/lib/ipft_tx.c \
src/external/bsd/ipf/dist/lib/printactivenat.c \
src/external/bsd/ipf/dist/lib/printnat.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ipf/dist/lib/printaps.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ipf/dist/tools/ipf.c \
src/external/bsd/ipf/dist/tools/ipfs.c \
src/external/bsd/ipf/dist/tools/ipnat.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ipf/dist/tools/ipfcomp.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/ipf/dist/tools/ipfstat.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ipf/dist/tools/ipftest.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/ipf/dist/tools/ipmon.c
cvs rdiff -u -r1.21 -r1.22 src/sys/external/bsd/ipf/netinet/fil.c
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/ipf/bin/ipftest/bpf_filter.c
diff -u src/external/bsd/ipf/bin/ipftest/bpf_filter.c:1.1 src/external/bsd/ipf/bin/ipftest/bpf_filter.c:1.2
--- src/external/bsd/ipf/bin/ipftest/bpf_filter.c:1.1 Fri Mar 23 21:29:45 2012
+++ src/external/bsd/ipf/bin/ipftest/bpf_filter.c Sun Feb 4 08:19:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: bpf_filter.c,v 1.1 2012/03/23 21:29:45 christos Exp $ */
+/* $NetBSD: bpf_filter.c,v 1.2 2018/02/04 08:19:42 mrg Exp $ */
/*-
* Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
@@ -41,7 +41,7 @@
*/
#if !(defined(lint) || defined(KERNEL) || defined(_KERNEL))
-static const char rcsid[] =
+static __attribute__((__used__)) const char rcsid[] =
"@(#) Header: /devel/CVS/IP-Filter/bpf_filter.c,v 2.2.2.3 2006/10/03 11:25:56 darrenr Exp (LBL)";
#endif
Index: src/external/bsd/ipf/dist/ip_fil.c
diff -u src/external/bsd/ipf/dist/ip_fil.c:1.4 src/external/bsd/ipf/dist/ip_fil.c:1.5
--- src/external/bsd/ipf/dist/ip_fil.c:1.4 Sun Jul 22 14:27:35 2012
+++ src/external/bsd/ipf/dist/ip_fil.c Sun Feb 4 08:19:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_fil.c,v 1.4 2012/07/22 14:27:35 darrenr Exp $ */
+/* $NetBSD: ip_fil.c,v 1.5 2018/02/04 08:19:42 mrg Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -8,8 +8,8 @@
* Id: ip_fil.c,v 1.1.1.2 2012/07/22 13:44:12 darrenr Exp
*/
#if !defined(lint)
-static const char sccsid[] = "@(#)ip_fil.c 2.41 6/5/96 (C) 1993-2000 Darren Reed";
-static const char rcsid[] = "@(#)Id: ip_fil.c,v 1.1.1.2 2012/07/22 13:44:12 darrenr Exp";
+static __attribute__((__used__)) const char sccsid[] = "@(#)ip_fil.c 2.41 6/5/96 (C) 1993-2000 Darren Reed";
+static __attribute__((__used__)) const char rcsid[] = "@(#)Id: ip_fil.c,v 1.1.1.2 2012/07/22 13:44:12 darrenr Exp";
#endif
#include "ipf.h"
Index: src/external/bsd/ipf/dist/ipsend/ip.c
diff -u src/external/bsd/ipf/dist/ipsend/ip.c:1.3 src/external/bsd/ipf/dist/ipsend/ip.c:1.4
--- src/external/bsd/ipf/dist/ipsend/ip.c:1.3 Sun Jul 22 14:27:35 2012
+++ src/external/bsd/ipf/dist/ipsend/ip.c Sun Feb 4 08:19:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ip.c,v 1.3 2012/07/22 14:27:35 darrenr Exp $ */
+/* $NetBSD: ip.c,v 1.4 2018/02/04 08:19:42 mrg Exp $ */
/*
* ip.c (C) 1995-1998 Darren Reed
@@ -6,8 +6,8 @@
* See the IPFILTER.LICENCE file for details on licencing.
*/
#if !defined(lint)
-static const char sccsid[] = "%W% %G% (C)1995";
-static const char rcsid[] = "@(#)Id: ip.c,v 1.1.1.2 2012/07/22 13:44:36 darrenr";
+static __attribute__((__used__)) const char sccsid[] = "%W% %G% (C)1995";
+static __attribute__((__used__)) const char rcsid[] = "@(#)Id: ip.c,v 1.1.1.2 2012/07/22 13:44:36 darrenr";
#endif
#include <sys/param.h>
#include <sys/types.h>
Index: src/external/bsd/ipf/dist/ipsend/sbpf.c
diff -u src/external/bsd/ipf/dist/ipsend/sbpf.c:1.3 src/external/bsd/ipf/dist/ipsend/sbpf.c:1.4
--- src/external/bsd/ipf/dist/ipsend/sbpf.c:1.3 Sun Jul 22 14:27:36 2012
+++ src/external/bsd/ipf/dist/ipsend/sbpf.c Sun Feb 4 08:19:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sbpf.c,v 1.3 2012/07/22 14:27:36 darrenr Exp $ */
+/* $NetBSD: sbpf.c,v 1.4 2018/02/04 08:19:42 mrg Exp $ */
/*
* (C)opyright 1995-1998 Darren Reed. (from tcplog)
@@ -49,8 +49,8 @@
#include "ipsend.h"
#if !defined(lint)
-static const char sccsid[] = "@(#)sbpf.c 1.3 8/25/95 (C)1995 Darren Reed";
-static const char rcsid[] = "@(#)Id: sbpf.c,v 1.1.1.2 2012/07/22 13:44:37 darrenr Exp $";
+static __attribute__((__used__)) const char sccsid[] = "@(#)sbpf.c 1.3 8/25/95 (C)1995 Darren Reed";
+static __attribute__((__used__)) const char rcsid[] = "@(#)Id: sbpf.c,v 1.1.1.2 2012/07/22 13:44:37 darrenr Exp $";
#endif
/*
Index: src/external/bsd/ipf/dist/ipsend/ipresend.c
diff -u src/external/bsd/ipf/dist/ipsend/ipresend.c:1.2 src/external/bsd/ipf/dist/ipsend/ipresend.c:1.3
--- src/external/bsd/ipf/dist/ipsend/ipresend.c:1.2 Sun Jul 22 14:27:35 2012
+++ src/external/bsd/ipf/dist/ipsend/ipresend.c Sun Feb 4 08:19:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ipresend.c,v 1.2 2012/07/22 14:27:35 darrenr Exp $ */
+/* $NetBSD: ipresend.c,v 1.3 2018/02/04 08:19:42 mrg Exp $ */
/*
* ipresend.c (C) 1995-1998 Darren Reed
@@ -7,8 +7,8 @@
*
*/
#if !defined(lint)
-static const char sccsid[] = "%W% %G% (C)1995 Darren Reed";
-static const char rcsid[] = "@(#)Id: ipresend.c,v 1.1.1.2 2012/07/22 13:44:36 darrenr Exp $";
+static __attribute__((__used__)) const char sccsid[] = "%W% %G% (C)1995 Darren Reed";
+static __attribute__((__used__)) const char rcsid[] = "@(#)Id: ipresend.c,v 1.1.1.2 2012/07/22 13:44:36 darrenr Exp $";
#endif
#include <sys/param.h>
#include <sys/types.h>
Index: src/external/bsd/ipf/dist/ipsend/ipsend.c
diff -u src/external/bsd/ipf/dist/ipsend/ipsend.c:1.2 src/external/bsd/ipf/dist/ipsend/ipsend.c:1.3
--- src/external/bsd/ipf/dist/ipsend/ipsend.c:1.2 Sun Jul 22 14:27:35 2012
+++ src/external/bsd/ipf/dist/ipsend/ipsend.c Sun Feb 4 08:19:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsend.c,v 1.2 2012/07/22 14:27:35 darrenr Exp $ */
+/* $NetBSD: ipsend.c,v 1.3 2018/02/04 08:19:42 mrg Exp $ */
/*
* ipsend.c (C) 1995-1998 Darren Reed
@@ -6,8 +6,8 @@
* See the IPFILTER.LICENCE file for details on licencing.
*/
#if !defined(lint)
-static const char sccsid[] = "@(#)ipsend.c 1.5 12/10/95 (C)1995 Darren Reed";
-static const char rcsid[] = "@(#)Id: ipsend.c,v 1.1.1.2 2012/07/22 13:44:36 darrenr Exp $";
+static __attribute__((__used__)) const char sccsid[] = "@(#)ipsend.c 1.5 12/10/95 (C)1995 Darren Reed";
+static __attribute__((__used__)) const char rcsid[] = "@(#)Id: ipsend.c,v 1.1.1.2 2012/07/22 13:44:36 darrenr Exp $";
#endif
#include <sys/param.h>
#include <sys/types.h>
Index: src/external/bsd/ipf/dist/ipsend/ipsopt.c
diff -u src/external/bsd/ipf/dist/ipsend/ipsopt.c:1.2 src/external/bsd/ipf/dist/ipsend/ipsopt.c:1.3
--- src/external/bsd/ipf/dist/ipsend/ipsopt.c:1.2 Sun Jul 22 14:27:36 2012
+++ src/external/bsd/ipf/dist/ipsend/ipsopt.c Sun Feb 4 08:19:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsopt.c,v 1.2 2012/07/22 14:27:36 darrenr Exp $ */
+/* $NetBSD: ipsopt.c,v 1.3 2018/02/04 08:19:42 mrg Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -7,8 +7,8 @@
*
*/
#if !defined(lint)
-static const char sccsid[] = "@(#)ipsopt.c 1.2 1/11/96 (C)1995 Darren Reed";
-static const char rcsid[] = "@(#)Id: ipsopt.c,v 1.1.1.2 2012/07/22 13:44:36 darrenr Exp $";
+static __attribute__((__used__)) const char sccsid[] = "@(#)ipsopt.c 1.2 1/11/96 (C)1995 Darren Reed";
+static __attribute__((__used__)) const char rcsid[] = "@(#)Id: ipsopt.c,v 1.1.1.2 2012/07/22 13:44:36 darrenr Exp $";
#endif
#include <sys/param.h>
#include <sys/types.h>
Index: src/external/bsd/ipf/dist/ipsend/iptest.c
diff -u src/external/bsd/ipf/dist/ipsend/iptest.c:1.2 src/external/bsd/ipf/dist/ipsend/iptest.c:1.3
--- src/external/bsd/ipf/dist/ipsend/iptest.c:1.2 Sun Jul 22 14:27:36 2012
+++ src/external/bsd/ipf/dist/ipsend/iptest.c Sun Feb 4 08:19:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: iptest.c,v 1.2 2012/07/22 14:27:36 darrenr Exp $ */
+/* $NetBSD: iptest.c,v 1.3 2018/02/04 08:19:42 mrg Exp $ */
/*
* ipsend.c (C) 1995-1998 Darren Reed
@@ -7,8 +7,8 @@
*
*/
#if !defined(lint)
-static const char sccsid[] = "%W% %G% (C)1995 Darren Reed";
-static const char rcsid[] = "@(#)Id: iptest.c,v 1.1.1.2 2012/07/22 13:44:37 darrenr Exp $";
+static __attribute__((__used__)) const char sccsid[] = "%W% %G% (C)1995 Darren Reed";
+static __attribute__((__used__)) const char rcsid[] = "@(#)Id: iptest.c,v 1.1.1.2 2012/07/22 13:44:37 darrenr Exp $";
#endif
#include <sys/param.h>
#include <sys/types.h>
Index: src/external/bsd/ipf/dist/ipsend/resend.c
diff -u src/external/bsd/ipf/dist/ipsend/resend.c:1.2 src/external/bsd/ipf/dist/ipsend/resend.c:1.3
--- src/external/bsd/ipf/dist/ipsend/resend.c:1.2 Sun Jul 22 14:27:36 2012
+++ src/external/bsd/ipf/dist/ipsend/resend.c Sun Feb 4 08:19:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: resend.c,v 1.2 2012/07/22 14:27:36 darrenr Exp $ */
+/* $NetBSD: resend.c,v 1.3 2018/02/04 08:19:42 mrg Exp $ */
/*
* resend.c (C) 1995-1998 Darren Reed
@@ -7,8 +7,8 @@
*
*/
#if !defined(lint)
-static const char sccsid[] = "@(#)resend.c 1.3 1/11/96 (C)1995 Darren Reed";
-static const char rcsid[] = "@(#)Id: resend.c,v 1.1.1.2 2012/07/22 13:44:37 darrenr Exp $";
+static __attribute__((__used__)) const char sccsid[] = "@(#)resend.c 1.3 1/11/96 (C)1995 Darren Reed";
+static __attribute__((__used__)) const char rcsid[] = "@(#)Id: resend.c,v 1.1.1.2 2012/07/22 13:44:37 darrenr Exp $";
#endif
#include <sys/param.h>
#include <sys/types.h>
Index: src/external/bsd/ipf/dist/ipsend/iptests.c
diff -u src/external/bsd/ipf/dist/ipsend/iptests.c:1.4 src/external/bsd/ipf/dist/ipsend/iptests.c:1.5
--- src/external/bsd/ipf/dist/ipsend/iptests.c:1.4 Thu Jun 15 23:53:56 2017
+++ src/external/bsd/ipf/dist/ipsend/iptests.c Sun Feb 4 08:19:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: iptests.c,v 1.4 2017/06/15 23:53:56 kamil Exp $ */
+/* $NetBSD: iptests.c,v 1.5 2018/02/04 08:19:42 mrg Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -7,8 +7,8 @@
*
*/
#if !defined(lint)
-static const char sccsid[] = "%W% %G% (C)1995 Darren Reed";
-static const char rcsid[] = "@(#)Id: iptests.c,v 1.1.1.2 2012/07/22 13:44:37 darrenr";
+static __attribute__((__used__)) const char sccsid[] = "%W% %G% (C)1995 Darren Reed";
+static __attribute__((__used__)) const char rcsid[] = "@(#)Id: iptests.c,v 1.1.1.2 2012/07/22 13:44:37 darrenr";
#endif
#include <sys/param.h>
#include <sys/types.h>
Index: src/external/bsd/ipf/dist/ipsend/sock.c
diff -u src/external/bsd/ipf/dist/ipsend/sock.c:1.4 src/external/bsd/ipf/dist/ipsend/sock.c:1.5
--- src/external/bsd/ipf/dist/ipsend/sock.c:1.4 Thu Jun 15 23:50:20 2017
+++ src/external/bsd/ipf/dist/ipsend/sock.c Sun Feb 4 08:19:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sock.c,v 1.4 2017/06/15 23:50:20 kamil Exp $ */
+/* $NetBSD: sock.c,v 1.5 2018/02/04 08:19:42 mrg Exp $ */
/*
* sock.c (C) 1995-1998 Darren Reed
@@ -7,8 +7,8 @@
*
*/
#if !defined(lint)
-static const char sccsid[] = "@(#)sock.c 1.2 1/11/96 (C)1995 Darren Reed";
-static const char rcsid[] = "@(#)Id: sock.c,v 1.1.1.2 2012/07/22 13:44:38 darrenr";
+static __attribute__((__used__)) const char sccsid[] = "@(#)sock.c 1.2 1/11/96 (C)1995 Darren Reed";
+static __attribute__((__used__)) const char rcsid[] = "@(#)Id: sock.c,v 1.1.1.2 2012/07/22 13:44:38 darrenr";
#endif
#include <sys/param.h>
#include <sys/types.h>
Index: src/external/bsd/ipf/dist/lib/facpri.c
diff -u src/external/bsd/ipf/dist/lib/facpri.c:1.2 src/external/bsd/ipf/dist/lib/facpri.c:1.3
--- src/external/bsd/ipf/dist/lib/facpri.c:1.2 Sun Jul 22 14:27:36 2012
+++ src/external/bsd/ipf/dist/lib/facpri.c Sun Feb 4 08:19:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: facpri.c,v 1.2 2012/07/22 14:27:36 darrenr Exp $ */
+/* $NetBSD: facpri.c,v 1.3 2018/02/04 08:19:42 mrg Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -22,7 +22,7 @@
#include "facpri.h"
#if !defined(lint)
-static const char rcsid[] = "@(#)Id: facpri.c,v 1.1.1.2 2012/07/22 13:44:38 darrenr Exp $";
+static __attribute__((__used__)) const char rcsid[] = "@(#)Id: facpri.c,v 1.1.1.2 2012/07/22 13:44:38 darrenr Exp $";
#endif
Index: src/external/bsd/ipf/dist/lib/getnattype.c
diff -u src/external/bsd/ipf/dist/lib/getnattype.c:1.2 src/external/bsd/ipf/dist/lib/getnattype.c:1.3
--- src/external/bsd/ipf/dist/lib/getnattype.c:1.2 Sun Jul 22 14:27:36 2012
+++ src/external/bsd/ipf/dist/lib/getnattype.c Sun Feb 4 08:19:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: getnattype.c,v 1.2 2012/07/22 14:27:36 darrenr Exp $ */
+/* $NetBSD: getnattype.c,v 1.3 2018/02/04 08:19:42 mrg Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -11,7 +11,7 @@
#include "kmem.h"
#if !defined(lint)
-static const char rcsid[] = "@(#)Id: getnattype.c,v 1.1.1.2 2012/07/22 13:44:38 darrenr Exp $";
+static __attribute__((__used__)) const char rcsid[] = "@(#)Id: getnattype.c,v 1.1.1.2 2012/07/22 13:44:38 darrenr Exp $";
#endif
Index: src/external/bsd/ipf/dist/lib/ipft_pc.c
diff -u src/external/bsd/ipf/dist/lib/ipft_pc.c:1.2 src/external/bsd/ipf/dist/lib/ipft_pc.c:1.3
--- src/external/bsd/ipf/dist/lib/ipft_pc.c:1.2 Sun Jul 22 14:27:36 2012
+++ src/external/bsd/ipf/dist/lib/ipft_pc.c Sun Feb 4 08:19:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ipft_pc.c,v 1.2 2012/07/22 14:27:36 darrenr Exp $ */
+/* $NetBSD: ipft_pc.c,v 1.3 2018/02/04 08:19:42 mrg Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -11,7 +11,7 @@
#include "ipt.h"
#if !defined(lint)
-static const char rcsid[] = "@(#)Id: ipft_pc.c,v 1.1.1.2 2012/07/22 13:44:39 darrenr Exp $";
+static __attribute__((__used__)) const char rcsid[] = "@(#)Id: ipft_pc.c,v 1.1.1.2 2012/07/22 13:44:39 darrenr Exp $";
#endif
struct llc {
Index: src/external/bsd/ipf/dist/lib/kmem.c
diff -u src/external/bsd/ipf/dist/lib/kmem.c:1.2 src/external/bsd/ipf/dist/lib/kmem.c:1.3
--- src/external/bsd/ipf/dist/lib/kmem.c:1.2 Sun Jul 22 14:27:36 2012
+++ src/external/bsd/ipf/dist/lib/kmem.c Sun Feb 4 08:19:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: kmem.c,v 1.2 2012/07/22 14:27:36 darrenr Exp $ */
+/* $NetBSD: kmem.c,v 1.3 2018/02/04 08:19:42 mrg Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -43,8 +43,8 @@
#endif
#if !defined(lint)
-static const char sccsid[] = "@(#)kmem.c 1.4 1/12/96 (C) 1992 Darren Reed";
-static const char rcsid[] = "@(#)Id: kmem.c,v 1.1.1.2 2012/07/22 13:44:39 darrenr Exp $";
+static __attribute__((__used__)) const char sccsid[] = "@(#)kmem.c 1.4 1/12/96 (C) 1992 Darren Reed";
+static __attribute__((__used__)) const char rcsid[] = "@(#)Id: kmem.c,v 1.1.1.2 2012/07/22 13:44:39 darrenr Exp $";
#endif
Index: src/external/bsd/ipf/dist/lib/nat_setgroupmap.c
diff -u src/external/bsd/ipf/dist/lib/nat_setgroupmap.c:1.2 src/external/bsd/ipf/dist/lib/nat_setgroupmap.c:1.3
--- src/external/bsd/ipf/dist/lib/nat_setgroupmap.c:1.2 Sun Jul 22 14:27:36 2012
+++ src/external/bsd/ipf/dist/lib/nat_setgroupmap.c Sun Feb 4 08:19:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: nat_setgroupmap.c,v 1.2 2012/07/22 14:27:36 darrenr Exp $ */
+/* $NetBSD: nat_setgroupmap.c,v 1.3 2018/02/04 08:19:42 mrg Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -6,7 +6,7 @@
* See the IPFILTER.LICENCE file for details on licencing.
*/
#if !defined(lint)
-static const char rcsid[] = "@(#)Id: nat_setgroupmap.c,v 1.1.1.2 2012/07/22 13:44:39 darrenr Exp $";
+static __attribute__((__used__)) const char rcsid[] = "@(#)Id: nat_setgroupmap.c,v 1.1.1.2 2012/07/22 13:44:39 darrenr Exp $";
#endif
#include "ipf.h"
Index: src/external/bsd/ipf/dist/lib/printactiveaddr.c
diff -u src/external/bsd/ipf/dist/lib/printactiveaddr.c:1.2 src/external/bsd/ipf/dist/lib/printactiveaddr.c:1.3
--- src/external/bsd/ipf/dist/lib/printactiveaddr.c:1.2 Sun Jul 22 14:27:36 2012
+++ src/external/bsd/ipf/dist/lib/printactiveaddr.c Sun Feb 4 08:19:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: printactiveaddr.c,v 1.2 2012/07/22 14:27:36 darrenr Exp $ */
+/* $NetBSD: printactiveaddr.c,v 1.3 2018/02/04 08:19:42 mrg Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -12,7 +12,7 @@
#if !defined(lint)
-static const char rcsid[] = "@(#)Id: printactiveaddr.c,v 1.1.1.2 2012/07/22 13:44:40 darrenr Exp $";
+static __attribute__((__used__)) const char rcsid[] = "@(#)Id: printactiveaddr.c,v 1.1.1.2 2012/07/22 13:44:40 darrenr Exp $";
#endif
Index: src/external/bsd/ipf/dist/lib/printnataddr.c
diff -u src/external/bsd/ipf/dist/lib/printnataddr.c:1.2 src/external/bsd/ipf/dist/lib/printnataddr.c:1.3
--- src/external/bsd/ipf/dist/lib/printnataddr.c:1.2 Sun Jul 22 14:27:37 2012
+++ src/external/bsd/ipf/dist/lib/printnataddr.c Sun Feb 4 08:19:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: printnataddr.c,v 1.2 2012/07/22 14:27:37 darrenr Exp $ */
+/* $NetBSD: printnataddr.c,v 1.3 2018/02/04 08:19:42 mrg Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -13,7 +13,7 @@
#if !defined(lint)
-static const char rcsid[] = "@(#)Id: printnataddr.c,v 1.1.1.2 2012/07/22 13:44:41 darrenr Exp $";
+static __attribute__((__used__)) const char rcsid[] = "@(#)Id: printnataddr.c,v 1.1.1.2 2012/07/22 13:44:41 darrenr Exp $";
#endif
Index: src/external/bsd/ipf/dist/lib/printproto.c
diff -u src/external/bsd/ipf/dist/lib/printproto.c:1.2 src/external/bsd/ipf/dist/lib/printproto.c:1.3
--- src/external/bsd/ipf/dist/lib/printproto.c:1.2 Sun Jul 22 14:27:37 2012
+++ src/external/bsd/ipf/dist/lib/printproto.c Sun Feb 4 08:19:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: printproto.c,v 1.2 2012/07/22 14:27:37 darrenr Exp $ */
+/* $NetBSD: printproto.c,v 1.3 2018/02/04 08:19:42 mrg Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -10,7 +10,7 @@
#if !defined(lint)
-static const char rcsid[] = "@(#)Id: printproto.c,v 1.1.1.2 2012/07/22 13:44:42 darrenr Exp $";
+static __attribute__((__used__)) const char rcsid[] = "@(#)Id: printproto.c,v 1.1.1.2 2012/07/22 13:44:42 darrenr Exp $";
#endif
Index: src/external/bsd/ipf/dist/lib/ipft_hx.c
diff -u src/external/bsd/ipf/dist/lib/ipft_hx.c:1.3 src/external/bsd/ipf/dist/lib/ipft_hx.c:1.4
--- src/external/bsd/ipf/dist/lib/ipft_hx.c:1.3 Sun Oct 20 03:09:11 2013
+++ src/external/bsd/ipf/dist/lib/ipft_hx.c Sun Feb 4 08:19:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ipft_hx.c,v 1.3 2013/10/20 03:09:11 christos Exp $ */
+/* $NetBSD: ipft_hx.c,v 1.4 2018/02/04 08:19:42 mrg Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -6,8 +6,8 @@
* See the IPFILTER.LICENCE file for details on licencing.
*/
#if !defined(lint)
-static const char sccsid[] = "@(#)ipft_hx.c 1.1 3/9/96 (C) 1996 Darren Reed";
-static const char rcsid[] = "@(#)Id: ipft_hx.c,v 1.1.1.2 2012/07/22 13:44:39 darrenr Exp $";
+static __attribute__((__used__)) const char sccsid[] = "@(#)ipft_hx.c 1.1 3/9/96 (C) 1996 Darren Reed";
+static __attribute__((__used__)) const char rcsid[] = "@(#)Id: ipft_hx.c,v 1.1.1.2 2012/07/22 13:44:39 darrenr Exp $";
#endif
#include <ctype.h>
Index: src/external/bsd/ipf/dist/lib/ipft_tx.c
diff -u src/external/bsd/ipf/dist/lib/ipft_tx.c:1.3 src/external/bsd/ipf/dist/lib/ipft_tx.c:1.4
--- src/external/bsd/ipf/dist/lib/ipft_tx.c:1.3 Sun Oct 20 03:09:11 2013
+++ src/external/bsd/ipf/dist/lib/ipft_tx.c Sun Feb 4 08:19:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ipft_tx.c,v 1.3 2013/10/20 03:09:11 christos Exp $ */
+/* $NetBSD: ipft_tx.c,v 1.4 2018/02/04 08:19:42 mrg Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -8,8 +8,8 @@
* Id: ipft_tx.c,v 1.1.1.2 2012/07/22 13:44:39 darrenr Exp $
*/
#if !defined(lint)
-static const char sccsid[] = "@(#)ipft_tx.c 1.7 6/5/96 (C) 1993 Darren Reed";
-static const char rcsid[] = "@(#)Id: ipft_tx.c,v 1.1.1.2 2012/07/22 13:44:39 darrenr Exp $";
+static __attribute__((__used__)) const char sccsid[] = "@(#)ipft_tx.c 1.7 6/5/96 (C) 1993 Darren Reed";
+static __attribute__((__used__)) const char rcsid[] = "@(#)Id: ipft_tx.c,v 1.1.1.2 2012/07/22 13:44:39 darrenr Exp $";
#endif
#include <ctype.h>
Index: src/external/bsd/ipf/dist/lib/printactivenat.c
diff -u src/external/bsd/ipf/dist/lib/printactivenat.c:1.3 src/external/bsd/ipf/dist/lib/printactivenat.c:1.4
--- src/external/bsd/ipf/dist/lib/printactivenat.c:1.3 Sun Jul 22 14:27:36 2012
+++ src/external/bsd/ipf/dist/lib/printactivenat.c Sun Feb 4 08:19:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: printactivenat.c,v 1.3 2012/07/22 14:27:36 darrenr Exp $ */
+/* $NetBSD: printactivenat.c,v 1.4 2018/02/04 08:19:42 mrg Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -12,7 +12,7 @@
#if !defined(lint)
-static const char rcsid[] = "@(#)Id: printactivenat.c,v 1.1.1.2 2012/07/22 13:44:40 darrenr";
+static __attribute__((__used__)) const char rcsid[] = "@(#)Id: printactivenat.c,v 1.1.1.2 2012/07/22 13:44:40 darrenr";
#endif
Index: src/external/bsd/ipf/dist/lib/printnat.c
diff -u src/external/bsd/ipf/dist/lib/printnat.c:1.3 src/external/bsd/ipf/dist/lib/printnat.c:1.4
--- src/external/bsd/ipf/dist/lib/printnat.c:1.3 Sun Jun 29 08:51:01 2014
+++ src/external/bsd/ipf/dist/lib/printnat.c Sun Feb 4 08:19:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: printnat.c,v 1.3 2014/06/29 08:51:01 darrenr Exp $ */
+/* $NetBSD: printnat.c,v 1.4 2018/02/04 08:19:42 mrg Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -13,7 +13,7 @@
#if !defined(lint)
-static const char rcsid[] = "@(#)Id: printnat.c,v 1.1.1.2 2012/07/22 13:44:41 darrenr Exp $";
+static __attribute__((__used__)) const char rcsid[] = "@(#)Id: printnat.c,v 1.1.1.2 2012/07/22 13:44:41 darrenr Exp $";
#endif
Index: src/external/bsd/ipf/dist/lib/printaps.c
diff -u src/external/bsd/ipf/dist/lib/printaps.c:1.4 src/external/bsd/ipf/dist/lib/printaps.c:1.5
--- src/external/bsd/ipf/dist/lib/printaps.c:1.4 Sun Jul 22 18:09:16 2012
+++ src/external/bsd/ipf/dist/lib/printaps.c Sun Feb 4 08:19:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: printaps.c,v 1.4 2012/07/22 18:09:16 martin Exp $ */
+/* $NetBSD: printaps.c,v 1.5 2018/02/04 08:19:42 mrg Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -13,7 +13,7 @@
#if !defined(lint)
-static const char rcsid[] = "@(#)Id: printaps.c,v 1.1.1.2 2012/07/22 13:44:40 darrenr Exp $";
+static __attribute__((__used__)) const char rcsid[] = "@(#)Id: printaps.c,v 1.1.1.2 2012/07/22 13:44:40 darrenr Exp $";
#endif
Index: src/external/bsd/ipf/dist/tools/ipf.c
diff -u src/external/bsd/ipf/dist/tools/ipf.c:1.2 src/external/bsd/ipf/dist/tools/ipf.c:1.3
--- src/external/bsd/ipf/dist/tools/ipf.c:1.2 Sun Jul 22 14:27:51 2012
+++ src/external/bsd/ipf/dist/tools/ipf.c Sun Feb 4 08:19:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ipf.c,v 1.2 2012/07/22 14:27:51 darrenr Exp $ */
+/* $NetBSD: ipf.c,v 1.3 2018/02/04 08:19:42 mrg Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -21,8 +21,8 @@
#include "netinet/ipl.h"
#if !defined(lint)
-static const char sccsid[] = "@(#)ipf.c 1.23 6/5/96 (C) 1993-2000 Darren Reed";
-static const char rcsid[] = "@(#)Id: ipf.c,v 1.1.1.2 2012/07/22 13:44:51 darrenr Exp $";
+static __attribute__((__used__)) const char sccsid[] = "@(#)ipf.c 1.23 6/5/96 (C) 1993-2000 Darren Reed";
+static __attribute__((__used__)) const char rcsid[] = "@(#)Id: ipf.c,v 1.1.1.2 2012/07/22 13:44:51 darrenr Exp $";
#endif
#if !defined(__SVR4) && defined(__GNUC__)
Index: src/external/bsd/ipf/dist/tools/ipfs.c
diff -u src/external/bsd/ipf/dist/tools/ipfs.c:1.2 src/external/bsd/ipf/dist/tools/ipfs.c:1.3
--- src/external/bsd/ipf/dist/tools/ipfs.c:1.2 Sun Jul 22 14:27:51 2012
+++ src/external/bsd/ipf/dist/tools/ipfs.c Sun Feb 4 08:19:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ipfs.c,v 1.2 2012/07/22 14:27:51 darrenr Exp $ */
+/* $NetBSD: ipfs.c,v 1.3 2018/02/04 08:19:42 mrg Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -44,7 +44,7 @@
#include "netinet/ipl.h"
#if !defined(lint)
-static const char rcsid[] = "@(#)Id: ipfs.c,v 1.1.1.2 2012/07/22 13:44:53 darrenr Exp $";
+static __attribute__((__used__)) const char rcsid[] = "@(#)Id: ipfs.c,v 1.1.1.2 2012/07/22 13:44:53 darrenr Exp $";
#endif
#ifndef IPF_SAVEDIR
Index: src/external/bsd/ipf/dist/tools/ipnat.c
diff -u src/external/bsd/ipf/dist/tools/ipnat.c:1.2 src/external/bsd/ipf/dist/tools/ipnat.c:1.3
--- src/external/bsd/ipf/dist/tools/ipnat.c:1.2 Sun Jul 22 14:27:51 2012
+++ src/external/bsd/ipf/dist/tools/ipnat.c Sun Feb 4 08:19:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ipnat.c,v 1.2 2012/07/22 14:27:51 darrenr Exp $ */
+/* $NetBSD: ipnat.c,v 1.3 2018/02/04 08:19:42 mrg Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -66,8 +66,8 @@ extern char *sys_errlist[];
#endif
#if !defined(lint)
-static const char sccsid[] ="@(#)ipnat.c 1.9 6/5/96 (C) 1993 Darren Reed";
-static const char rcsid[] = "@(#)Id: ipnat.c,v 1.1.1.2 2012/07/22 13:44:56 darrenr Exp $";
+static __attribute__((__used__)) const char sccsid[] ="@(#)ipnat.c 1.9 6/5/96 (C) 1993 Darren Reed";
+static __attribute__((__used__)) const char rcsid[] = "@(#)Id: ipnat.c,v 1.1.1.2 2012/07/22 13:44:56 darrenr Exp $";
#endif
Index: src/external/bsd/ipf/dist/tools/ipfcomp.c
diff -u src/external/bsd/ipf/dist/tools/ipfcomp.c:1.4 src/external/bsd/ipf/dist/tools/ipfcomp.c:1.5
--- src/external/bsd/ipf/dist/tools/ipfcomp.c:1.4 Sun Oct 20 03:09:11 2013
+++ src/external/bsd/ipf/dist/tools/ipfcomp.c Sun Feb 4 08:19:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ipfcomp.c,v 1.4 2013/10/20 03:09:11 christos Exp $ */
+/* $NetBSD: ipfcomp.c,v 1.5 2018/02/04 08:19:42 mrg Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -6,8 +6,8 @@
* See the IPFILTER.LICENCE file for details on licencing.
*/
#if !defined(lint)
-static const char sccsid[] = "@(#)ip_fil.c 2.41 6/5/96 (C) 1993-2000 Darren Reed";
-static const char rcsid[] = "@(#)Id: ipfcomp.c,v 1.1.1.2 2012/07/22 13:44:53 darrenr";
+static __attribute__((__used__)) const char sccsid[] = "@(#)ip_fil.c 2.41 6/5/96 (C) 1993-2000 Darren Reed";
+static __attribute__((__used__)) const char rcsid[] = "@(#)Id: ipfcomp.c,v 1.1.1.2 2012/07/22 13:44:53 darrenr";
#endif
#include "ipf.h"
Index: src/external/bsd/ipf/dist/tools/ipfstat.c
diff -u src/external/bsd/ipf/dist/tools/ipfstat.c:1.5 src/external/bsd/ipf/dist/tools/ipfstat.c:1.6
--- src/external/bsd/ipf/dist/tools/ipfstat.c:1.5 Mon Jun 16 12:37:58 2014
+++ src/external/bsd/ipf/dist/tools/ipfstat.c Sun Feb 4 08:19:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ipfstat.c,v 1.5 2014/06/16 12:37:58 christos Exp $ */
+/* $NetBSD: ipfstat.c,v 1.6 2018/02/04 08:19:42 mrg Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -71,8 +71,8 @@
#endif
#if !defined(lint)
-static const char sccsid[] = "@(#)fils.c 1.21 4/20/96 (C) 1993-2000 Darren Reed";
-static const char rcsid[] = "@(#)Id: ipfstat.c,v 1.1.1.2 2012/07/22 13:44:55 darrenr";
+static __attribute__((__used__)) const char sccsid[] = "@(#)fils.c 1.21 4/20/96 (C) 1993-2000 Darren Reed";
+static __attribute__((__used__)) const char rcsid[] = "@(#)Id: ipfstat.c,v 1.1.1.2 2012/07/22 13:44:55 darrenr";
#endif
#ifdef __hpux
Index: src/external/bsd/ipf/dist/tools/ipftest.c
diff -u src/external/bsd/ipf/dist/tools/ipftest.c:1.3 src/external/bsd/ipf/dist/tools/ipftest.c:1.4
--- src/external/bsd/ipf/dist/tools/ipftest.c:1.3 Sun Jul 22 14:27:51 2012
+++ src/external/bsd/ipf/dist/tools/ipftest.c Sun Feb 4 08:19:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ipftest.c,v 1.3 2012/07/22 14:27:51 darrenr Exp $ */
+/* $NetBSD: ipftest.c,v 1.4 2018/02/04 08:19:42 mrg Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -11,8 +11,8 @@
#include <sys/file.h>
#if !defined(lint)
-static const char sccsid[] = "@(#)ipt.c 1.19 6/3/96 (C) 1993-2000 Darren Reed";
-static const char rcsid[] = "@(#)Id: ipftest.c,v 1.1.1.2 2012/07/22 13:44:55 darrenr Exp";
+static __attribute__((__used__)) const char sccsid[] = "@(#)ipt.c 1.19 6/3/96 (C) 1993-2000 Darren Reed";
+static __attribute__((__used__)) const char rcsid[] = "@(#)Id: ipftest.c,v 1.1.1.2 2012/07/22 13:44:55 darrenr Exp";
#endif
extern char *optarg;
Index: src/external/bsd/ipf/dist/tools/ipmon.c
diff -u src/external/bsd/ipf/dist/tools/ipmon.c:1.7 src/external/bsd/ipf/dist/tools/ipmon.c:1.8
--- src/external/bsd/ipf/dist/tools/ipmon.c:1.7 Sat Oct 27 20:07:12 2012
+++ src/external/bsd/ipf/dist/tools/ipmon.c Sun Feb 4 08:19:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ipmon.c,v 1.7 2012/10/27 20:07:12 nakayama Exp $ */
+/* $NetBSD: ipmon.c,v 1.8 2018/02/04 08:19:42 mrg Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -16,8 +16,8 @@
#include <err.h>
#if !defined(lint)
-static const char sccsid[] = "@(#)ipmon.c 1.21 6/5/96 (C)1993-2000 Darren Reed";
-static const char rcsid[] = "@(#)Id: ipmon.c,v 1.1.1.2 2012/07/22 13:44:56 darrenr Exp ";
+static __attribute__((__used__)) const char sccsid[] = "@(#)ipmon.c 1.21 6/5/96 (C)1993-2000 Darren Reed";
+static __attribute__((__used__)) const char rcsid[] = "@(#)Id: ipmon.c,v 1.1.1.2 2012/07/22 13:44:56 darrenr Exp ";
#endif
Index: src/sys/external/bsd/ipf/netinet/fil.c
diff -u src/sys/external/bsd/ipf/netinet/fil.c:1.21 src/sys/external/bsd/ipf/netinet/fil.c:1.22
--- src/sys/external/bsd/ipf/netinet/fil.c:1.21 Tue Sep 5 11:12:32 2017
+++ src/sys/external/bsd/ipf/netinet/fil.c Sun Feb 4 08:19:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: fil.c,v 1.21 2017/09/05 11:12:32 christos Exp $ */
+/* $NetBSD: fil.c,v 1.22 2018/02/04 08:19:42 mrg Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -138,7 +138,7 @@ extern struct timeout ipf_slowtimer_ch;
#if !defined(lint)
#if defined(__NetBSD__)
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fil.c,v 1.21 2017/09/05 11:12:32 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fil.c,v 1.22 2018/02/04 08:19:42 mrg Exp $");
#else
static const char sccsid[] = "@(#)fil.c 1.36 6/5/96 (C) 1993-2000 Darren Reed";
static const char rcsid[] = "@(#)Id: fil.c,v 1.1.1.2 2012/07/22 13:45:07 darrenr Exp $";
@@ -4893,13 +4893,14 @@ frrequest(ipf_main_softc_t *softc, int u
error = ipf_outobj(softc, data, fp, IPFOBJ_FRENTRY);
if (error == 0) {
- if ((f->fr_dsize != 0) && (uptr != NULL))
+ if ((f->fr_dsize != 0) && (uptr != NULL)) {
error = COPYOUT(f->fr_data, uptr,
f->fr_dsize);
if (error != 0) {
IPFERROR(28);
error = EFAULT;
}
+ }
if (error == 0) {
f->fr_hits = 0;
f->fr_bytes = 0;
