Convert loadable_modules to SBufList (#1738)

[thirdparty/squid.git] / src / LoadableModules.cc

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());
 }