Merge pull request #14409 from fredmorcos/various-cleanups

Various cleanups
PowerDNS · Jul 3, 2024 · 53bcb9f · 53bcb9f
2 parents 61e0281 + d262b84
commit 53bcb9f
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 21 deletions.
diff --git a/modules/geoipbackend/geoipbackend.cc b/modules/geoipbackend/geoipbackend.cc
@@ -512,8 +512,9 @@ void GeoIPBackend::lookup(const QType& qtype, const DNSName& qdomain, int zoneId
   }
 
   Netmask addr{"0.0.0.0/0"};
-  if (pkt_p != nullptr)
+  if (pkt_p != nullptr) {
     addr = Netmask(pkt_p->getRealRemote());
+  }
 
   gl.netmask = 0;
 
@@ -582,8 +583,9 @@ void GeoIPBackend::lookup(const QType& qtype, const DNSName& qdomain, int zoneId
 
 bool GeoIPBackend::get(DNSResourceRecord& r)
 {
-  if (d_result.empty())
+  if (d_result.empty()) {
     return false;
+  }
 
   r = d_result.back();
   d_result.pop_back();

diff --git a/modules/lua2backend/lua2api2.hh b/modules/lua2backend/lua2api2.hh
@@ -24,6 +24,9 @@
 #include "boost/algorithm/string/join.hpp"
 #include "pdns/arguments.hh"
 
+#include "pdns/dnsbackend.hh"
+#include "pdns/lua-auth4.hh"
+
 class Lua2BackendAPIv2 : public DNSBackend, AuthLua4
 {
 private:

diff --git a/pdns/dnspacket.cc b/pdns/dnspacket.cc
@@ -112,9 +112,7 @@ ComboAddress DNSPacket::getRemote() const
 
 ComboAddress DNSPacket::getInnerRemote() const
 {
-  if (d_inner_remote)
-    return *d_inner_remote;
-  return d_remote;
+  return d_inner_remote ? *d_inner_remote : d_remote;
 }
 
 uint16_t DNSPacket::getRemotePort() const
@@ -708,14 +706,12 @@ bool DNSPacket::hasValidEDNSCookie() const
 
 Netmask DNSPacket::getRealRemote() const
 {
-  if(d_haveednssubnet)
-    return d_eso.source;
-  return Netmask(getInnerRemote());
+  return d_haveednssubnet ? d_eso.source : Netmask{getInnerRemote()};
 }
 
 void DNSPacket::setSocket(Utility::sock_t sock)
 {
-  d_socket=sock;
+  d_socket = sock;
 }
 
 void DNSPacket::commitD()

diff --git a/pdns/misc.cc b/pdns/misc.cc
@@ -284,7 +284,7 @@ auto pdns::OpenSSL::error(const std::string& errorMessage) -> std::runtime_error
     }
   }
 #endif
-  return std::runtime_error(fullErrorMessage);
+  return std::runtime_error{fullErrorMessage};
 }
 
 auto pdns::OpenSSL::error(const std::string& componentName, const std::string& errorMessage) -> std::runtime_error

diff --git a/pdns/misc.hh b/pdns/misc.hh
@@ -46,7 +46,17 @@
 class DNSName;
 
 // Do not change to "using TSIGHashEnum ..." until you know CodeQL does not choke on it
-typedef enum { TSIG_MD5, TSIG_SHA1, TSIG_SHA224, TSIG_SHA256, TSIG_SHA384, TSIG_SHA512, TSIG_GSS } TSIGHashEnum;
+typedef enum
+{
+  TSIG_MD5,
+  TSIG_SHA1,
+  TSIG_SHA224,
+  TSIG_SHA256,
+  TSIG_SHA384,
+  TSIG_SHA512,
+  TSIG_GSS,
+} TSIGHashEnum;
+
 namespace pdns
 {
 /**

diff --git a/pdns/opensslsigners.cc b/pdns/opensslsigners.cc
@@ -19,14 +19,13 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
+
+#include "config.h"
 #include "misc.hh"
 #include <memory>
 #include <openssl/crypto.h>
 #include <openssl/ec.h>
 #include <optional>
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
 #include <openssl/obj_mac.h>
 #ifdef HAVE_LIBCRYPTO_ECDSA
 #include <openssl/ecdsa.h>

diff --git a/pdns/pdnsutil.cc b/pdns/pdnsutil.cc
@@ -4231,16 +4231,15 @@ try
   }
   return 0;
 }
-catch(PDNSException& ae) {
-  cerr<<"Error: "<<ae.reason<<endl;
+catch (PDNSException& ae) {
+  cerr << "Error: " << ae.reason << endl;
   return 1;
 }
-catch(std::exception& e) {
-  cerr<<"Error: "<<e.what()<<endl;
+catch (std::exception& e) {
+  cerr << "Error: " << e.what() << endl;
   return 1;
 }
-catch(...)
-{
-  cerr<<"Caught an unknown exception"<<endl;
+catch (...) {
+  cerr << "Caught an unknown exception" << endl;
   return 1;
 }