Convert loadable_modules to SBufList (#1738)

no behaviour changes.

diff --git a/src/LoadableModule.cc b/src/LoadableModule.cc
index efaf8efcffb28d6fb8e9f94e3ab6a2e519ce0e5e..0291c0978c07bde4881331228b727a6a183cc199 100644 (file)
--- a/src/LoadableModule.cc
+++ b/src/LoadableModule.cc
@@ -14,7 +14,8 @@
 // Note: We must use preprocessor instead of C ifs because if dlopen()
 // is seen by the static linker, the linker will complain.
 
-LoadableModule::LoadableModule(const String &aName): theName(aName), theHandle(nullptr)
+LoadableModule::LoadableModule(const SBuf &aName):
+    theName(aName)
 {
     // Initialise preloaded symbol lookup table.
     LTDL_SET_PRELOADED_SYMBOLS();
@@ -62,7 +63,7 @@ LoadableModule::unload()
 void *
 LoadableModule::openModule()
 {
-    return lt_dlopen(theName.termedBuf());
+    return lt_dlopen(theName.c_str());
 }
 
 bool

diff --git a/src/LoadableModule.h b/src/LoadableModule.h
index 3c246758153adf9bb7c47c850f9a73c195333642..8601b4984eb125af566797dcdcd7fbdf2a642221 100644 (file)
--- a/src/LoadableModule.h
+++ b/src/LoadableModule.h
@@ -9,26 +9,26 @@
 #ifndef SQUID_SRC_LOADABLEMODULE_H
 #define SQUID_SRC_LOADABLEMODULE_H
 
-#include "SquidString.h"
+#include "sbuf/SBuf.h"
 
 // wrapper for dlopen(3), libltdl, and friends
 class LoadableModule
 {
 public:
-    LoadableModule(const String &aName);
+    explicit LoadableModule(const SBuf &aName);
     ~LoadableModule();           // unloads if loaded
 
     bool loaded() const;
-    const String &name() const { return theName; }
-    const String &error() const { return theError; }
+    const auto &name() const { return theName; }
+    const auto &error() const { return theError; }
 
     void load(); // throws Texc
     void unload(); // throws Texc
 
 protected:
-    String theName;
-    String theError;
-    void *theHandle;
+    SBuf theName;
+    SBuf theError;
+    void *theHandle = nullptr;
 
 private:
     void *openModule();

diff --git a/src/LoadableModules.cc b/src/LoadableModules.cc
index d3024d2b375d05b3b448057c4cf218ea7e8b9409..1a5258e372737fdeb116be2b9ecaf20121501ddf 100644 (file)
--- a/src/LoadableModules.cc
+++ b/src/LoadableModules.cc
@@ -8,17 +8,16 @@
 
 #include "squid.h"
 #include "debug/Messages.h"
-#include "debug/Stream.h"
 #include "LoadableModule.h"
 #include "LoadableModules.h"
-#include "wordlist.h"
+#include "sbuf/List.h"
 
 static void
-LoadModule(const char *fname)
+LoadModule(const SBuf &fname)
 {
     debugs(1, DBG_IMPORTANT, "Loading Squid module from '" << fname << "'");
 
-    LoadableModule *m = new LoadableModule(fname);
+    const auto m = new LoadableModule(fname);
     m->load();
     debugs(1, 2, "Loaded Squid module from '" << fname << "'");
 
@@ -26,11 +25,11 @@ LoadModule(const char *fname)
 }
 
 void
-LoadableModulesConfigure(const wordlist *names)
+LoadableModulesConfigure(const SBufList &names)
 {
-    int count = 0;
-    for (const wordlist *i = names; i; i = i->next, ++count)
-        LoadModule(i->key);
-    debugs(1, Important(25), "Squid plugin modules loaded: " << count);
+    for (const auto &name : names) {
+        LoadModule(name);
+    }
+    debugs(1, Important(25), "Squid plugin modules loaded: " << names.size());
 }
 

diff --git a/src/LoadableModules.h b/src/LoadableModules.h
index 25e1624b4d5f6bf18327a4ff7fa1136f8c43e0ff..8cb7ef8028a531d0b2ce5b561a800789f6305d09 100644 (file)
--- a/src/LoadableModules.h
+++ b/src/LoadableModules.h
@@ -9,11 +9,13 @@
 #ifndef SQUID_SRC_LOADABLEMODULES_H
 #define SQUID_SRC_LOADABLEMODULES_H
 
+#include "sbuf/forward.h"
+
 // TODO: add reporting for cachemgr
 // TODO: add reconfiguration support
 
-class wordlist;
-void LoadableModulesConfigure(const wordlist *names);
+/// dynamically load named libraries, in the listed order
+void LoadableModulesConfigure(const SBufList &);
 
 #endif /* SQUID_SRC_LOADABLEMODULES_H */
 

diff --git a/src/SquidConfig.h b/src/SquidConfig.h
index 83063220ade36d4101ed8570743fc676bc3c4eb7..8ac9a47b94112d43ecb74616537b6cb0968c1131 100644 (file)
--- a/src/SquidConfig.h
+++ b/src/SquidConfig.h
@@ -519,7 +519,7 @@ public:
     CpuAffinityMap *cpuAffinityMap;
 
 #if USE_LOADABLE_MODULES
-    wordlist *loadable_module_names;
+    SBufList loadable_module_names;
 #endif
 
     int client_ip_max_connections;

diff --git a/src/cf.data.pre b/src/cf.data.pre
index 644899e67698240866c086da8e7399f11fd8da1e..48e40882ab11b585813298e92d761afcce65dc1e 100644 (file)
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -9766,7 +9766,7 @@ ecap_service s2 respmod_precache ecap://filters.R.us/virusFilter config=/etc/vf.
 DOC_END
 
 NAME: loadable_modules
-TYPE: wordlist
+TYPE: SBufList
 IFDEF: USE_LOADABLE_MODULES
 LOC: Config.loadable_module_names
 DEFAULT: none