]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Rename s_starttime, s_programname
authorChris Hofstaedtler <chris.hofstaedtler@deduktiva.com>
Wed, 10 Aug 2022 12:51:21 +0000 (14:51 +0200)
committerChris Hofstaedtler <chris.hofstaedtler@deduktiva.com>
Sat, 10 Sep 2022 10:28:16 +0000 (12:28 +0200)
pdns/auth-main.cc
pdns/auth-main.hh
pdns/dynhandler.cc
pdns/dynloader.cc
pdns/packethandler.cc
pdns/pdnsutil.cc
pdns/ws-auth.cc

index dbd756401223d069b184032e66a168a546949428..d23bfa30355e68122a91858e7f5d44d56aa1610f 100644 (file)
@@ -88,9 +88,9 @@
 #include "minicurl.hh"
 #endif /* HAVE_LUA_RECORDS */
 
-time_t s_starttime;
+time_t g_starttime;
 
-string s_programname = "pdns"; // used in packethandler.cc
+string g_programname = "pdns"; // used in packethandler.cc
 
 const char* funnytext = "*****************************************************************************\n"
                         "Ok, you just ran pdns_server through 'strings' hoping to find funny messages.\n"
@@ -953,7 +953,7 @@ static void writePid()
     fname = ::arg()["chroot"] + ::arg()["socket-dir"];
   }
 
-  fname += +"/" + s_programname + ".pid";
+  fname += +"/" + g_programname + ".pid";
   ofstream of(fname.c_str());
   if (of)
     of << getpid() << endl;
@@ -1011,7 +1011,7 @@ static int guardian(int argc, char** argv)
 
   int infd = 0, outfd = 1;
 
-  DynListener dlg(s_programname);
+  DynListener dlg(g_programname);
   dlg.registerFunc("QUIT", &DLQuitHandler, "quit daemon");
   dlg.registerFunc("CYCLE", &DLCycleHandler, "restart instance");
   dlg.registerFunc("PING", &DLPingHandler, "ping guardian");
@@ -1188,8 +1188,8 @@ int main(int argc, char** argv)
   versionSetProduct(ProductAuthoritative);
   reportAllTypes(); // init MOADNSParser
 
-  s_programname = "pdns";
-  s_starttime = time(nullptr);
+  g_programname = "pdns";
+  g_starttime = time(nullptr);
 
 #if defined(__GLIBC__) && !defined(__UCLIBC__)
   signal(SIGSEGV, tbhandler);
@@ -1213,11 +1213,11 @@ int main(int argc, char** argv)
     }
 
     if (::arg()["config-name"] != "")
-      s_programname += "-" + ::arg()["config-name"];
+      g_programname += "-" + ::arg()["config-name"];
 
-    g_log.setName(s_programname);
+    g_log.setName(g_programname);
 
-    string configname = ::arg()["config-dir"] + "/" + s_programname + ".conf";
+    string configname = ::arg()["config-dir"] + "/" + g_programname + ".conf";
     cleanSlashes(configname);
 
     if (::arg()["config"] != "default" && !::arg().mustDo("no-config")) // "config" == print a configuration file
@@ -1401,7 +1401,7 @@ int main(int argc, char** argv)
       if (::arg().mustDo("control-console"))
         g_DynListener = std::make_unique<DynListener>();
       else
-        g_DynListener = std::make_unique<DynListener>(s_programname);
+        g_DynListener = std::make_unique<DynListener>(g_programname);
 
       writePid();
     }
index 5d194dc36878f53540d7a0f489cd5a92f5671763..bfc53cf9ef70102509090435170921c80b8b70e0 100644 (file)
@@ -35,7 +35,7 @@
 #include "tcpreceiver.hh"
 #include "dnsseckeeper.hh"
 
-extern time_t s_starttime;
+extern time_t g_starttime;
 extern ArgvMap theArg;
 extern StatBag S; //!< Statistics are gathered across PDNS via the StatBag class S
 extern AuthPacketCache PC; //!< This is the main PacketCache, shared across all threads
index 9a27e3302854cf5c3d749e039c7112086b859ba4..64037a3ba22c34a7ecddb6d8a6e253a89b1263bf 100644 (file)
@@ -124,7 +124,7 @@ string DLStatusHandler(const vector<string>&parts, Utility::pid_t ppid)
 string DLUptimeHandler(const vector<string>&parts, Utility::pid_t ppid)
 {
   ostringstream os;
-  os<<humanDuration(time(nullptr)-s_starttime);
+  os<<humanDuration(time(nullptr)-g_starttime);
   return os.str();
 }
 
index 7799c300fdd5801595e253584043d124199a5d55..9b8ba89ca798de7165d0d3695050dfb28be7cf92 100644 (file)
@@ -54,7 +54,7 @@ StatBag S;
 
 int main(int argc, char **argv)
 {
-  string s_programname="pdns";
+  string programname="pdns";
 
   ::arg().set("config-dir","Location of configuration directory (pdns.conf)")=SYSCONFDIR;
   ::arg().set("socket-dir",string("Where the controlsocket will live, ")+LOCALSTATEDIR+"/pdns when unset and not chrooted" )="";
@@ -83,9 +83,9 @@ int main(int argc, char **argv)
   }
 
   if(::arg()["config-name"]!="")
-    s_programname+="-"+::arg()["config-name"];
+    programname+="-"+::arg()["config-name"];
 
-  string configname=::arg()["config-dir"]+"/"+s_programname+".conf";
+  string configname=::arg()["config-dir"]+"/"+programname+".conf";
   cleanSlashes(configname);
 
   if(!::arg().mustDo("no-config")) {
@@ -103,7 +103,7 @@ int main(int argc, char **argv)
     socketname = ::arg()["chroot"] + ::arg()["socket-dir"];
   }
 
-  socketname += "/" + s_programname + ".controlsocket";
+  socketname += "/" + programname + ".controlsocket";
   cleanSlashes(socketname);
 
   try {
index f15eb3f3696573915616787c22618c633f3444e0..6ae3d081deda3bc0805f21c2fc7428a27692a372 100644 (file)
@@ -58,13 +58,13 @@ NetmaskGroup PacketHandler::s_allowNotifyFrom;
 set<string> PacketHandler::s_forwardNotify;
 bool PacketHandler::s_SVCAutohints{false};
 
-extern string s_programname;
+extern string g_programname;
 
 // See https://www.rfc-editor.org/rfc/rfc8078.txt and https://www.rfc-editor.org/errata/eid5049 for details
 const std::shared_ptr<CDNSKEYRecordContent> PacketHandler::s_deleteCDNSKEYContent = std::make_shared<CDNSKEYRecordContent>("0 3 0 AA==");
 const std::shared_ptr<CDSRecordContent> PacketHandler::s_deleteCDSContent = std::make_shared<CDSRecordContent>("0 0 0 00");
 
-PacketHandler::PacketHandler():B(s_programname), d_dk(&B)
+PacketHandler::PacketHandler():B(g_programname), d_dk(&B)
 {
   ++s_count;
   d_doDNAME=::arg().mustDo("dname-processing");
index 60fe6a8a0e2abf842b8cc8fcd055fbac635d18af..5f80ab26c42edc91ece7abc8d5813d7bf04cecce 100644 (file)
@@ -51,7 +51,7 @@ uint16_t g_maxNSEC3Iterations{0};
 namespace po = boost::program_options;
 po::variables_map g_vm;
 
-string s_programname="pdns";
+string g_programname="pdns";
 
 namespace {
   bool g_verbose;
@@ -90,9 +90,9 @@ static void loadMainConfig(const std::string& configdir)
   }
 
   if(::arg()["config-name"]!="")
-    s_programname+="-"+::arg()["config-name"];
+    g_programname+="-"+::arg()["config-name"];
 
-  string configname=::arg()["config-dir"]+"/"+s_programname+".conf";
+  string configname=::arg()["config-dir"]+"/"+g_programname+".conf";
   cleanSlashes(configname);
 
   ::arg().set("resolver","Use this resolver for ALIAS and the internal stub resolver")="no";
index 733a127f89464c567800222930262ab32b09fc8e..648938d31f504ca44d77f7a39db6a151b7276f21 100644 (file)
@@ -240,7 +240,7 @@ void AuthWebServer::indexfunction(HttpRequest* req, HttpResponse* resp)
   ret<<"<div class=\"header columns\"></div></div>";
   ret<<R"(<div class="row"><div class="all columns">)";
 
-  time_t passed=time(nullptr)-s_starttime;
+  time_t passed=time(nullptr)-g_starttime;
 
   ret<<"<p>Uptime: "<<
     humanDuration(passed)<<
@@ -516,7 +516,7 @@ void productServerStatisticsFetch(map<string,string>& out)
   }
 
   // add uptime
-  out["uptime"] = std::to_string(time(nullptr) - s_starttime);
+  out["uptime"] = std::to_string(time(nullptr) - g_starttime);
 }
 
 std::optional<uint64_t> productServerStatisticsFetch(const std::string& name)