Move capdns from tcpdump.c to addrtoname.c.

Address the warning below (specific to a few versions of Clang, CMake
and FreeBSD) and update the exemption rule comment in build.sh.

tcpdump.c:244:16: warning: no previous extern declaration for non-static
  variable 'capdns' [-Wmissing-variable-declarations]

(cherry picked from commit e5bf4ceec7bf1a5a08852ad3a449a5f259f9bed5)

diff --git a/addrtoname.c b/addrtoname.c
index 58ced4f9b5ef971dd61e3b94972817965a600bb0..eb3df77ee7ea2ebad9e6591075013ecac3cde691 100644 (file)
--- a/addrtoname.c
+++ b/addrtoname.c
@@ -254,7 +254,7 @@ intoa(uint32_t addr)
 static uint32_t f_netmask;
 static uint32_t f_localnet;
 #ifdef HAVE_CASPER
-extern cap_channel_t *capdns;
+cap_channel_t *capdns;
 #endif
 
 /*

diff --git a/addrtoname.h b/addrtoname.h
index 94b41d7bee2c2b55c4219385a70a25f93564c1e3..597f4e1edcf0d3b25302d1faa504b552f3a6b6c2 100644 (file)
--- a/addrtoname.h
+++ b/addrtoname.h
@@ -21,6 +21,11 @@
 
 #include "extract.h"
 
+#ifdef HAVE_CASPER
+#include <libcasper.h>
+extern cap_channel_t *capdns;
+#endif
+
 /*
  * Definition to let us compile most of the IPv6 code even on systems
  * without IPv6 support.

diff --git a/build.sh b/build.sh
index 3588f81c2a63ab8805e2f82b62966283db523ea1..16a0945878085aa08b762f80cd20fa67c7baa0eb 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -42,8 +42,6 @@ FreeBSD-*/yes)
         #   [-Werror,-Wc11-extensions]
         # tcpdump.c:2443:9: error: '_Generic' is a C11 extension
         #   [-Werror,-Wc11-extensions]
-        # tcpdump.c:244:16: error: no previous extern declaration for non-static variable
-        #   'capdns' [-Werror,-Wmissing-variable-declarations]
         TCPDUMP_TAINTED=yes
         ;;
     esac

diff --git a/tcpdump.c b/tcpdump.c
index 8a3b6ce70805dfa4265664b29d894f1d023f63f8..6a9144c730751048ef783d45034a74bb91f874fe 100644 (file)
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -240,10 +240,6 @@ static int infoprint;
 
 char *program_name;
 
-#ifdef HAVE_CASPER
-cap_channel_t *capdns;
-#endif
-
 /* Forwards */
 static NORETURN void error(FORMAT_STRING(const char *), ...) PRINTFLIKE(1, 2);
 static void warning(FORMAT_STRING(const char *), ...) PRINTFLIKE(1, 2);