From f56d26c9e954ce9c44862aa2519a88e55f672a96 Mon Sep 17 00:00:00 2001 From: Remi Gacogne Date: Thu, 23 Apr 2020 15:41:41 +0200 Subject: [PATCH] dnsdist: Fix warnings about dup/missing prototypes Including a wrong FFI prototype. --- pdns/dnsdist-console.cc | 2 +- pdns/dnsdist-lua-vars.cc | 1 + pdns/dnsdist-tcp.cc | 2 +- pdns/dnsdist.cc | 2 +- pdns/dnsdist.hh | 1 - pdns/dnsdistdist/dnsdist-lua-inspection-ffi.hh | 2 +- pdns/dnsdistdist/tcpiohandler.cc | 4 ++-- pdns/dnslabeltext.rl | 1 + pdns/sodcrypto.cc | 4 ++-- 9 files changed, 10 insertions(+), 9 deletions(-) diff --git a/pdns/dnsdist-console.cc b/pdns/dnsdist-console.cc index fcee1ce2cf..bb9d6998ba 100644 --- a/pdns/dnsdist-console.cc +++ b/pdns/dnsdist-console.cc @@ -614,7 +614,7 @@ const std::vector 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 b76a05cfee..7058deab3d 100644 --- 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 4ae3199e08..854c996e34 100644 --- 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& buffer, size_t& pos, size_t toRead) +static IOState tryRead(int fd, std::vector& 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 ff1d890383..610387ca7a 100644 --- a/pdns/dnsdist.cc +++ b/pdns/dnsdist.cc @@ -1543,7 +1543,7 @@ uint64_t g_maxTCPClientThreads{10}; std::atomic g_cacheCleaningDelay{60}; std::atomic 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 2149661617..3785baffd8 100644 --- a/pdns/dnsdist.hh +++ b/pdns/dnsdist.hh @@ -1097,7 +1097,6 @@ struct LocalHolders struct dnsheader; -void controlThread(int fd, ComboAddress local); vector> 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 2b81c60b20..6988d451b8 100644 --- 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 71ca39f516..9823ae569c 100644 --- a/pdns/dnsdistdist/tcpiohandler.cc +++ b/pdns/dnsdistdist/tcpiohandler.cc @@ -399,14 +399,14 @@ private: #include #include -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 826f666845..ebd8944e11 100644 --- a/pdns/dnslabeltext.rl +++ b/pdns/dnslabeltext.rl @@ -5,6 +5,7 @@ #include #include "dnsname.hh" #include "namespaces.hh" +#include "dnswriter.hh" namespace { void appendSplit(vector& ret, string& segment, char c) diff --git a/pdns/sodcrypto.cc b/pdns/sodcrypto.cc index 567db8674a..967efc87f2 100644 --- a/pdns/sodcrypto.cc +++ b/pdns/sodcrypto.cc @@ -113,7 +113,7 @@ bool sodIsValidKey(const std::string& key) #include 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) { -- 2.47.2