Fix a set of trivial unused warnings

diff --git a/pcap-bt-linux.c b/pcap-bt-linux.c
index 85b4ac07bcaa7a3a25423a61dbe182bd00345025..3cd4f5000f11d14886a205e3ac1ca74e7a5492f0 100644 (file)
--- a/pcap-bt-linux.c
+++ b/pcap-bt-linux.c
@@ -300,7 +300,7 @@ close_fail:
 }
 
 static int
-bt_read_linux(pcap_t *handle, int max_packets, pcap_handler callback, u_char *user)
+bt_read_linux(pcap_t *handle, int max_packets _U_, pcap_handler callback, u_char *user)
 {
        struct cmsghdr *cmsg;
        struct msghdr msg;
@@ -370,7 +370,7 @@ bt_read_linux(pcap_t *handle, int max_packets, pcap_handler callback, u_char *us
 }
 
 static int
-bt_inject_linux(pcap_t *handle, const void *buf, size_t size)
+bt_inject_linux(pcap_t *handle, const void *buf _U_, size_t size _U_)
 {
        pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "inject not supported on "
                "bluetooth devices");

diff --git a/pcap-dbus.c b/pcap-dbus.c
index 7f835d1d6f062d3f6750c903ec288e298bf1633a..c23640539b65a1ba70d1d5448a68dce52493088c 100644 (file)
--- a/pcap-dbus.c
+++ b/pcap-dbus.c
@@ -51,7 +51,7 @@ struct pcap_dbus {
 };
 
 static int
-dbus_read(pcap_t *handle, int max_packets, pcap_handler callback, u_char *user)
+dbus_read(pcap_t *handle, int max_packets _U_, pcap_handler callback, u_char *user)
 {
        struct pcap_dbus *handlep = handle->priv;
 

diff --git a/pcap-linux.c b/pcap-linux.c
index 6b3b1fd99a2004c7f62fd4ed79f03f12ed05c343..e32d3e9194740fa8a8133ee60f8a9f52518455b5 100644 (file)
--- a/pcap-linux.c
+++ b/pcap-linux.c
@@ -1627,7 +1627,7 @@ fail:
  *  error occured.
  */
 static int
-pcap_read_linux(pcap_t *handle, int max_packets, pcap_handler callback, u_char *user)
+pcap_read_linux(pcap_t *handle, int max_packets _U_, pcap_handler callback, u_char *user)
 {
        /*
         * Currently, on Linux only one packet is delivered per read,

diff --git a/pcap-netfilter-linux.c b/pcap-netfilter-linux.c
index 785cd2a093cc52e03bd5d2d2b816094777fc534c..ee4f01883b9ab748e35f9f2713eca222e8993765 100644 (file)
--- a/pcap-netfilter-linux.c
+++ b/pcap-netfilter-linux.c
@@ -299,7 +299,7 @@ netfilter_stats_linux(pcap_t *handle, struct pcap_stat *stats)
 }
 
 static int
-netfilter_inject_linux(pcap_t *handle, const void *buf, size_t size)
+netfilter_inject_linux(pcap_t *handle, const void *buf _U_, size_t size _U_)
 {
        pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "inject not supported on netfilter devices");
        return (-1);

diff --git a/pcap-usb-linux.c b/pcap-usb-linux.c
index dbd9d017c6463e717ad9dc7f4127dd0fd145a2a4..6e0e3b1486999e3d0a17c508fda6b34e07037659 100644 (file)
--- a/pcap-usb-linux.c
+++ b/pcap-usb-linux.c
@@ -706,7 +706,7 @@ ascii_to_int(char c)
  * format description
  */
 static int
-usb_read_linux(pcap_t *handle, int max_packets, pcap_handler callback, u_char *user)
+usb_read_linux(pcap_t *handle, int max_packets _U_, pcap_handler callback, u_char *user)
 {
        /* see:
        * /usr/src/linux/Documentation/usb/usbmon.txt
@@ -903,7 +903,7 @@ got:
 }
 
 static int
-usb_inject_linux(pcap_t *handle, const void *buf, size_t size)
+usb_inject_linux(pcap_t *handle, const void *buf _U_, size_t size _U_)
 {
        pcap_snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "inject not supported on "
                "USB devices");
@@ -1019,7 +1019,7 @@ usb_stats_linux_bin(pcap_t *handle, struct pcap_stat *stats)
  * <linux-kernel-source>/drivers/usb/mon/mon_bin.c binary ABI
  */
 static int
-usb_read_linux_bin(pcap_t *handle, int max_packets, pcap_handler callback, u_char *user)
+usb_read_linux_bin(pcap_t *handle, int max_packets _U_, pcap_handler callback, u_char *user)
 {
        struct pcap_usb_linux *handlep = handle->priv;
        struct mon_bin_get info;

diff --git a/testprogs/capturetest.c b/testprogs/capturetest.c
index 573239f2c0fc1193dbe55184822441dfd34e3c77..d625cb4ab2b7ed4b5fc2dbcf4848fc45864ffae9 100644 (file)
--- a/testprogs/capturetest.c
+++ b/testprogs/capturetest.c
@@ -213,7 +213,7 @@ main(int argc, char **argv)
 }
 
 static void
-countme(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
+countme(u_char *user, const struct pcap_pkthdr *h _U_, const u_char *sp _U_)
 {
        int *counterp = (int *)user;
 

diff --git a/testprogs/selpolltest.c b/testprogs/selpolltest.c
index 5d47b3d5cbe91f59c7904165f27f34b35f193058..339d72adf09f4a609d5c7f3d4a6ea3895d8805ec 100644 (file)
--- a/testprogs/selpolltest.c
+++ b/testprogs/selpolltest.c
@@ -52,7 +52,7 @@ The Regents of the University of California.  All rights reserved.\n";
 
 #include "pcap/funcattrs.h"
 
-char *program_name;
+static char *program_name;
 
 /* Forwards */
 static void countme(u_char *, const struct pcap_pkthdr *, const u_char *);
@@ -357,7 +357,7 @@ main(int argc, char **argv)
 }
 
 static void
-countme(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
+countme(u_char *user, const struct pcap_pkthdr *h _U_, const u_char *sp _U_)
 {
        int *counterp = (int *)user;
 

diff --git a/testprogs/threadsignaltest.c b/testprogs/threadsignaltest.c
index bd46f93601dd525cd57354d6a006fc728dd2b9ce..a60bb49523fbf2a6664d3b71afa1dd3c9a7a34df 100644 (file)
--- a/testprogs/threadsignaltest.c
+++ b/testprogs/threadsignaltest.c
@@ -307,7 +307,7 @@ main(int argc, char **argv)
 }
 
 static void
-countme(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
+countme(u_char *user, const struct pcap_pkthdr *h _U_, const u_char *sp _U_)
 {
        int *counterp = (int *)user;