From 30e89f192a05c27009eb0df86d1ba44d6850b8e6 Mon Sep 17 00:00:00 2001
From: guy <guy>
Date: Sat, 15 Nov 2003 23:23:57 +0000
Subject: [PATCH] Add _U_ to "rcsid[]" definitions, to eliminate "unused
 variable" warnings from newer versions of GCC.

---
 Win32/Src/getaddrinfo.c | 4 ++--
 Win32/Src/inet_aton.c   | 6 +++---
 Win32/Src/inet_pton.c   | 6 +++---
 bpf/net/bpf_filter.c    | 4 ++--
 bpf_dump.c              | 4 ++--
 bpf_image.c             | 4 ++--
 etherent.c              | 4 ++--
 fad-getad.c             | 4 ++--
 fad-gifc.c              | 4 ++--
 fad-glifc.c             | 4 ++--
 fad-null.c              | 4 ++--
 fad-win32.c             | 4 ++--
 gencode.c               | 4 ++--
 grammar.y               | 4 ++--
 inet.c                  | 4 ++--
 nametoaddr.c            | 4 ++--
 optimize.c              | 4 ++--
 pcap-bpf.c              | 4 ++--
 pcap-dag.c              | 4 ++--
 pcap-dlpi.c             | 4 ++--
 pcap-enet.c             | 4 ++--
 pcap-linux.c            | 4 ++--
 pcap-nit.c              | 4 ++--
 pcap-null.c             | 4 ++--
 pcap-pf.c               | 4 ++--
 pcap-snit.c             | 4 ++--
 pcap-snoop.c            | 4 ++--
 pcap-win32.c            | 4 ++--
 pcap.c                  | 4 ++--
 savefile.c              | 4 ++--
 scanner.l               | 4 ++--
 31 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/Win32/Src/getaddrinfo.c b/Win32/Src/getaddrinfo.c
index b7608c2..813313f 100644
--- a/Win32/Src/getaddrinfo.c
+++ b/Win32/Src/getaddrinfo.c
@@ -50,8 +50,8 @@
 #endif 
 
 #ifndef lint
-static const char rcsid[] =
-     "@(#) $Header: /tcpdump/master/libpcap/Win32/Src/getaddrinfo.c,v 1.1 2002-08-01 08:33:09 risso Exp $";
+static const char rcsid[] _U_ =
+     "@(#) $Header: /tcpdump/master/libpcap/Win32/Src/getaddrinfo.c,v 1.2 2003-11-15 23:24:06 guy Exp $";
 #endif
 
 #include <pcap-stdinc.h>
diff --git a/Win32/Src/inet_aton.c b/Win32/Src/inet_aton.c
index 56bfe7b..3da6667 100644
--- a/Win32/Src/inet_aton.c
+++ b/Win32/Src/inet_aton.c
@@ -36,11 +36,11 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: inet_aton.c,v 1.1 2002-08-01 08:33:10 risso Exp $ */
+/* $Id: inet_aton.c,v 1.2 2003-11-15 23:24:06 guy Exp $ */
 
 #ifndef lint
-static const char rcsid[] =
-     "@(#) $Header: /tcpdump/master/libpcap/Win32/Src/inet_aton.c,v 1.1 2002-08-01 08:33:10 risso Exp $";
+static const char rcsid[] _U_ =
+     "@(#) $Header: /tcpdump/master/libpcap/Win32/Src/inet_aton.c,v 1.2 2003-11-15 23:24:06 guy Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/Win32/Src/inet_pton.c b/Win32/Src/inet_pton.c
index 4cd08f6..a0f4e3a 100644
--- a/Win32/Src/inet_pton.c
+++ b/Win32/Src/inet_pton.c
@@ -36,11 +36,11 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: inet_pton.c,v 1.1 2002-08-01 08:33:11 risso Exp $ */
+/* $Id: inet_pton.c,v 1.2 2003-11-15 23:24:06 guy Exp $ */
 
 #ifndef lint
-static const char rcsid[] =
-     "@(#) $Header: /tcpdump/master/libpcap/Win32/Src/inet_pton.c,v 1.1 2002-08-01 08:33:11 risso Exp $";
+static const char rcsid[] _U_ =
+     "@(#) $Header: /tcpdump/master/libpcap/Win32/Src/inet_pton.c,v 1.2 2003-11-15 23:24:06 guy Exp $";
 #endif
 
 #include <errno.h>
diff --git a/bpf/net/bpf_filter.c b/bpf/net/bpf_filter.c
index 768db6f..03fd2dd 100644
--- a/bpf/net/bpf_filter.c
+++ b/bpf/net/bpf_filter.c
@@ -39,8 +39,8 @@
  */
 
 #if !(defined(lint) || defined(KERNEL) || defined(_KERNEL))
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/libpcap/bpf/net/bpf_filter.c,v 1.43 2003-03-22 07:24:49 guy Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/libpcap/bpf/net/bpf_filter.c,v 1.44 2003-11-15 23:24:07 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
diff --git a/bpf_dump.c b/bpf_dump.c
index 74927f4..ad096b5 100644
--- a/bpf_dump.c
+++ b/bpf_dump.c
@@ -19,8 +19,8 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 #ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/libpcap/bpf_dump.c,v 1.13 2002-03-24 23:21:51 guy Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/libpcap/bpf_dump.c,v 1.14 2003-11-15 23:23:57 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
diff --git a/bpf_image.c b/bpf_image.c
index d38d978..06c0b6e 100644
--- a/bpf_image.c
+++ b/bpf_image.c
@@ -20,8 +20,8 @@
  */
 
 #ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/libpcap/bpf_image.c,v 1.25 2002-03-24 23:21:51 guy Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/libpcap/bpf_image.c,v 1.26 2003-11-15 23:23:57 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
diff --git a/etherent.c b/etherent.c
index a13a6f5..28b7028 100644
--- a/etherent.c
+++ b/etherent.c
@@ -20,8 +20,8 @@
  */
 
 #ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/libpcap/etherent.c,v 1.21 2000-07-11 00:37:04 assar Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/libpcap/etherent.c,v 1.22 2003-11-15 23:23:57 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
diff --git a/fad-getad.c b/fad-getad.c
index ba68b02..9c41217 100644
--- a/fad-getad.c
+++ b/fad-getad.c
@@ -33,8 +33,8 @@
  */
 
 #ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/libpcap/fad-getad.c,v 1.7 2003-09-10 23:06:43 guy Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/libpcap/fad-getad.c,v 1.8 2003-11-15 23:23:58 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
diff --git a/fad-gifc.c b/fad-gifc.c
index 83d3d11..1e5de31 100644
--- a/fad-gifc.c
+++ b/fad-gifc.c
@@ -33,8 +33,8 @@
  */
 
 #ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/libpcap/fad-gifc.c,v 1.4 2003-02-25 07:50:28 guy Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/libpcap/fad-gifc.c,v 1.5 2003-11-15 23:23:58 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
diff --git a/fad-glifc.c b/fad-glifc.c
index b777a02..e1ad491 100644
--- a/fad-glifc.c
+++ b/fad-glifc.c
@@ -33,8 +33,8 @@
  */
 
 #ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/libpcap/fad-glifc.c,v 1.2 2002-07-30 08:12:13 guy Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/libpcap/fad-glifc.c,v 1.3 2003-11-15 23:23:58 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
diff --git a/fad-null.c b/fad-null.c
index fec53cf..26d791d 100644
--- a/fad-null.c
+++ b/fad-null.c
@@ -33,8 +33,8 @@
  */
 
 #ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/libpcap/fad-null.c,v 1.1 2002-07-27 18:46:21 guy Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/libpcap/fad-null.c,v 1.2 2003-11-15 23:23:58 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
diff --git a/fad-win32.c b/fad-win32.c
index 7d799ce..c57ffe0 100644
--- a/fad-win32.c
+++ b/fad-win32.c
@@ -31,8 +31,8 @@
  */
 
 #ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/libpcap/fad-win32.c,v 1.7 2003-09-22 11:45:58 risso Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/libpcap/fad-win32.c,v 1.8 2003-11-15 23:23:59 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
diff --git a/gencode.c b/gencode.c
index 312783d..1d02c2e 100644
--- a/gencode.c
+++ b/gencode.c
@@ -20,8 +20,8 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 #ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/libpcap/gencode.c,v 1.193 2003-08-18 22:09:30 guy Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/libpcap/gencode.c,v 1.194 2003-11-15 23:23:59 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
diff --git a/grammar.y b/grammar.y
index b85ed28..3da3521 100644
--- a/grammar.y
+++ b/grammar.y
@@ -21,8 +21,8 @@
  *
  */
 #ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/libpcap/grammar.y,v 1.79 2003-03-11 06:23:53 guy Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/libpcap/grammar.y,v 1.80 2003-11-15 23:24:00 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
diff --git a/inet.c b/inet.c
index 974fbf1..7a8bf3d 100644
--- a/inet.c
+++ b/inet.c
@@ -33,8 +33,8 @@
  */
 
 #ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/libpcap/inet.c,v 1.58 2003-09-25 22:22:25 guy Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/libpcap/inet.c,v 1.59 2003-11-15 23:24:00 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
diff --git a/nametoaddr.c b/nametoaddr.c
index e50dded..5e4d395 100644
--- a/nametoaddr.c
+++ b/nametoaddr.c
@@ -23,8 +23,8 @@
  */
 
 #ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/libpcap/nametoaddr.c,v 1.68 2003-02-25 22:12:03 fenner Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/libpcap/nametoaddr.c,v 1.69 2003-11-15 23:24:00 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
diff --git a/optimize.c b/optimize.c
index 59101f4..da7a1e4 100644
--- a/optimize.c
+++ b/optimize.c
@@ -21,8 +21,8 @@
  *  Optimization module for tcpdump intermediate representation.
  */
 #ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/libpcap/optimize.c,v 1.76 2003-03-08 08:26:31 guy Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/libpcap/optimize.c,v 1.77 2003-11-15 23:24:00 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
diff --git a/pcap-bpf.c b/pcap-bpf.c
index bcfd556..88505c9 100644
--- a/pcap-bpf.c
+++ b/pcap-bpf.c
@@ -19,8 +19,8 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 #ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/libpcap/pcap-bpf.c,v 1.67 2003-11-04 07:05:32 guy Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/libpcap/pcap-bpf.c,v 1.68 2003-11-15 23:24:01 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
diff --git a/pcap-dag.c b/pcap-dag.c
index 016a087..9cecd55 100644
--- a/pcap-dag.c
+++ b/pcap-dag.c
@@ -18,8 +18,8 @@
  */
 
 #ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/libpcap/pcap-dag.c,v 1.10 2003-11-04 07:05:33 guy Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/libpcap/pcap-dag.c,v 1.11 2003-11-15 23:24:02 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
diff --git a/pcap-dlpi.c b/pcap-dlpi.c
index 51cc1e9..3500d3c 100644
--- a/pcap-dlpi.c
+++ b/pcap-dlpi.c
@@ -37,8 +37,8 @@
  */
 
 #ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/libpcap/pcap-dlpi.c,v 1.91 2003-11-04 07:05:33 guy Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/libpcap/pcap-dlpi.c,v 1.92 2003-11-15 23:24:02 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
diff --git a/pcap-enet.c b/pcap-enet.c
index 4458d6c..af19de5 100644
--- a/pcap-enet.c
+++ b/pcap-enet.c
@@ -7,8 +7,8 @@
  * Rayan Zachariassen, CA*Net
  */
 #ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/libpcap/pcap-enet.c,v 1.7 2003-02-11 01:46:06 guy Exp $";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/libpcap/pcap-enet.c,v 1.8 2003-11-15 23:24:02 guy Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
diff --git a/pcap-linux.c b/pcap-linux.c
index 520ddac..8ce13e5 100644
--- a/pcap-linux.c
+++ b/pcap-linux.c
@@ -26,8 +26,8 @@
  */
 
 #ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/libpcap/pcap-linux.c,v 1.98 2003-11-05 04:25:24 guy Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/libpcap/pcap-linux.c,v 1.99 2003-11-15 23:24:03 guy Exp $ (LBL)";
 #endif
 
 /*
diff --git a/pcap-nit.c b/pcap-nit.c
index b5fbb42..14f3283 100644
--- a/pcap-nit.c
+++ b/pcap-nit.c
@@ -19,8 +19,8 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 #ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/libpcap/pcap-nit.c,v 1.50 2003-11-04 07:05:35 guy Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/libpcap/pcap-nit.c,v 1.51 2003-11-15 23:24:03 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
diff --git a/pcap-null.c b/pcap-null.c
index 2a80c0a..9fa00a0 100644
--- a/pcap-null.c
+++ b/pcap-null.c
@@ -19,8 +19,8 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 #ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/libpcap/pcap-null.c,v 1.20 2003-07-25 05:32:04 guy Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/libpcap/pcap-null.c,v 1.21 2003-11-15 23:24:03 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
diff --git a/pcap-pf.c b/pcap-pf.c
index 1e735d6..9c52917 100644
--- a/pcap-pf.c
+++ b/pcap-pf.c
@@ -23,8 +23,8 @@
  */
 
 #ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/libpcap/pcap-pf.c,v 1.79 2003-11-04 07:05:36 guy Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/libpcap/pcap-pf.c,v 1.80 2003-11-15 23:24:04 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
diff --git a/pcap-snit.c b/pcap-snit.c
index b150e33..635aea9 100644
--- a/pcap-snit.c
+++ b/pcap-snit.c
@@ -24,8 +24,8 @@
  */
 
 #ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/libpcap/pcap-snit.c,v 1.66 2003-11-04 07:05:36 guy Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/libpcap/pcap-snit.c,v 1.67 2003-11-15 23:24:04 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
diff --git a/pcap-snoop.c b/pcap-snoop.c
index bd04233..6161774 100644
--- a/pcap-snoop.c
+++ b/pcap-snoop.c
@@ -19,8 +19,8 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 #ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/libpcap/pcap-snoop.c,v 1.46 2003-11-12 23:15:00 guy Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/libpcap/pcap-snoop.c,v 1.47 2003-11-15 23:24:04 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
diff --git a/pcap-win32.c b/pcap-win32.c
index 3ad6277..bf906fb 100644
--- a/pcap-win32.c
+++ b/pcap-win32.c
@@ -31,8 +31,8 @@
  */
 
 #ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/libpcap/pcap-win32.c,v 1.15 2003-11-04 07:05:37 guy Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/libpcap/pcap-win32.c,v 1.16 2003-11-15 23:24:05 guy Exp $ (LBL)";
 #endif
 
 #include <pcap-int.h>
diff --git a/pcap.c b/pcap.c
index 620e4d2..455b8b2 100644
--- a/pcap.c
+++ b/pcap.c
@@ -32,8 +32,8 @@
  */
 
 #ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/libpcap/pcap.c,v 1.63 2003-11-04 07:05:39 guy Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/libpcap/pcap.c,v 1.64 2003-11-15 23:24:05 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
diff --git a/savefile.c b/savefile.c
index 466f478..1f5798c 100644
--- a/savefile.c
+++ b/savefile.c
@@ -29,8 +29,8 @@
  */
 
 #ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/libpcap/savefile.c,v 1.93 2003-11-13 01:35:48 guy Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/libpcap/savefile.c,v 1.94 2003-11-15 23:24:05 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
diff --git a/scanner.l b/scanner.l
index 53be760..fd812c9 100644
--- a/scanner.l
+++ b/scanner.l
@@ -21,8 +21,8 @@
  */
 
 #ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/libpcap/scanner.l,v 1.95 2003-07-03 18:39:10 guy Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/libpcap/scanner.l,v 1.96 2003-11-15 23:24:05 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H