dnsdist: Fix warnings about dup/missing prototypes

Including a wrong FFI prototype.

diff --git a/pdns/dnsdist-console.cc b/pdns/dnsdist-console.cc
index fcee1ce2cf0975874fca30407a4410fe8a80f42c..bb9d6998ba95b99b9bc3f86d41191466c33d02b7 100644 (file)
--- a/pdns/dnsdist-console.cc
+++ b/pdns/dnsdist-console.cc
@@ -614,7 +614,7 @@ const std::vector<ConsoleKeyword> g_consoleKeywords{
 };
 
 extern "C" {
-char* my_generator(const char* text, int state)
+static char* my_generator(const char* text, int state)
 {
   string t(text);
   /* to keep it readable, we try to keep only 4 keywords per line

diff --git a/pdns/dnsdist-lua-vars.cc b/pdns/dnsdist-lua-vars.cc
index b76a05cfee59bb4f8b37788d1cca600416dfbc28..7058deab3d99a606df76e9448ac51fe2462c234e 100644 (file)
--- a/pdns/dnsdist-lua-vars.cc
+++ b/pdns/dnsdist-lua-vars.cc
@@ -20,6 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 #include "dnsdist.hh"
+#include "dnsdist-lua.hh"
 #include "ednsoptions.hh"
 
 #undef BADSIG  // signal.h SIG_ERR

diff --git a/pdns/dnsdist-tcp.cc b/pdns/dnsdist-tcp.cc
index 4ae3199e086126eac2646308a77a22d5789a9fac..854c996e342ef466d2faf56883fd7f755ddf43b7 100644 (file)
--- a/pdns/dnsdist-tcp.cc
+++ b/pdns/dnsdist-tcp.cc
@@ -395,7 +395,7 @@ static void cleanupClosedTCPConnections()
    would block.
 */
 // XXX could probably be implemented as a TCPIOHandler
-IOState tryRead(int fd, std::vector<uint8_t>& buffer, size_t& pos, size_t toRead)
+static IOState tryRead(int fd, std::vector<uint8_t>& buffer, size_t& pos, size_t toRead)
 {
   if (buffer.size() < (pos + toRead)) {
     throw std::out_of_range("Calling tryRead() with a too small buffer (" + std::to_string(buffer.size()) + ") for a read of " + std::to_string(toRead) + " bytes starting at " + std::to_string(pos));

diff --git a/pdns/dnsdist.cc b/pdns/dnsdist.cc
index ff1d8903834f456a3cc2935885dc1f181b98c299..610387ca7ae58db57249f8d0667c8d41ec87474c 100644 (file)
--- a/pdns/dnsdist.cc
+++ b/pdns/dnsdist.cc
@@ -1543,7 +1543,7 @@ uint64_t g_maxTCPClientThreads{10};
 std::atomic<uint16_t> g_cacheCleaningDelay{60};
 std::atomic<uint16_t> g_cacheCleaningPercentage{100};
 
-void maintThread()
+static void maintThread()
 {
   setThreadName("dnsdist/main");
   int interval = 1;

diff --git a/pdns/dnsdist.hh b/pdns/dnsdist.hh
index 214966161730d1900234c817bab503a1436db6d5..3785baffd89e398f576b92523f489da88f36a898 100644 (file)
--- a/pdns/dnsdist.hh
+++ b/pdns/dnsdist.hh
@@ -1097,7 +1097,6 @@ struct LocalHolders
 
 struct dnsheader;
 
-void controlThread(int fd, ComboAddress local);
 vector<std::function<void(void)>> setupLua(bool client, const std::string& config);
 
 struct WebserverConfig

diff --git a/pdns/dnsdistdist/dnsdist-lua-inspection-ffi.hh b/pdns/dnsdistdist/dnsdist-lua-inspection-ffi.hh
index 2b81c60b20913db775fdd20d2d87f3d6c1d8bdeb..6988d451b87ed8a7e3cf3d480239e8c13c3681f5 100644 (file)
--- a/pdns/dnsdistdist/dnsdist-lua-inspection-ffi.hh
+++ b/pdns/dnsdistdist/dnsdist-lua-inspection-ffi.hh
@@ -39,5 +39,5 @@ extern "C" {
   uint64_t dnsdist_ffi_stat_node_get_children_nxdomains_count(const dnsdist_ffi_stat_node_t* node) __attribute__ ((visibility ("default")));
   uint64_t dnsdist_ffi_stat_node_get_children_servfails_count(const dnsdist_ffi_stat_node_t* node) __attribute__ ((visibility ("default")));
   uint64_t dnsdist_ffi_stat_node_get_children_drops_count(const dnsdist_ffi_stat_node_t* node) __attribute__ ((visibility ("default")));
-  uint64_t dnsdist_ffi_stat_node_get_children_bytes(const dnsdist_ffi_stat_node_t* node) __attribute__ ((visibility ("default")));
+  uint64_t dnsdist_ffi_stat_node_get_children_bytes_count(const dnsdist_ffi_stat_node_t* node) __attribute__ ((visibility ("default")));
 }

diff --git a/pdns/dnsdistdist/tcpiohandler.cc b/pdns/dnsdistdist/tcpiohandler.cc
index 71ca39f516c0e5682eddf0a0908130601c80c9d6..9823ae569c35f20439c9a5c1aa5988c6641b3a23 100644 (file)
--- a/pdns/dnsdistdist/tcpiohandler.cc
+++ b/pdns/dnsdistdist/tcpiohandler.cc
@@ -399,14 +399,14 @@ private:
 #include <gnutls/gnutls.h>
 #include <gnutls/x509.h>
 
-void safe_memory_lock(void* data, size_t size)
+static void safe_memory_lock(void* data, size_t size)
 {
 #ifdef HAVE_LIBSODIUM
   sodium_mlock(data, size);
 #endif
 }
 
-void safe_memory_release(void* data, size_t size)
+static void safe_memory_release(void* data, size_t size)
 {
 #ifdef HAVE_LIBSODIUM
   sodium_munlock(data, size);

diff --git a/pdns/dnslabeltext.rl b/pdns/dnslabeltext.rl
index 826f666845bf3efcbdac60b737757686ce268b0c..ebd8944e11039b42e10b778cbe7e6c54d2549faf 100644 (file)
--- a/pdns/dnslabeltext.rl
+++ b/pdns/dnslabeltext.rl
@@ -5,6 +5,7 @@
 #include <string>
 #include "dnsname.hh"
 #include "namespaces.hh"
+#include "dnswriter.hh"
 
 namespace {
 void appendSplit(vector<string>& ret, string& segment, char c)

diff --git a/pdns/sodcrypto.cc b/pdns/sodcrypto.cc
index 567db8674a031d6851fdd14c8d23dfdd01dc97df..967efc87f2576dfbc27920611e43defd5fb2caec 100644 (file)
--- a/pdns/sodcrypto.cc
+++ b/pdns/sodcrypto.cc
@@ -113,7 +113,7 @@ bool sodIsValidKey(const std::string& key)
 #include <inttypes.h>
 
 namespace anonpdns {
-char B64Decode1(char cInChar)
+static char B64Decode1(char cInChar)
 {
   // The incoming character will be A-Z, a-z, 0-9, +, /, or =.
   // The idea is to quickly determine which grouping the
@@ -178,7 +178,7 @@ char B64Decode1(char cInChar)
   return iIndex;
 }
 
-inline char B64Encode1(unsigned char uc)
+static inline char B64Encode1(unsigned char uc)
 {
   if (uc < 26)
     {