1 files changed, 9 insertions, 12 deletions

diff --git a/src/common/helper.c b/src/common/helper.c
index c4aa8e18..c8065716 100644
--- a/src/common/helper.c
+++ b/src/common/helper.c
@@ -257,6 +257,7 @@ static void connector(const gchar *handler_name,
   Plugin * plug = user_data;
   void * method;
 
+  method = NULL;
   while (plug != NULL) {
     method = trybindDynamicMethod(plug->library,
                                   "",
@@ -283,8 +284,7 @@ void connectGladeWithPlugins(GladeXML * xml) {
 
 typedef void (*PlainCall)();
 
-static Plugin * loadPlugin(const char * name,
-                           Plugin * next) {
+static void loadPlugin(const char * name) {
   Plugin * p;
   void * lib;
   PlainCall init;
@@ -295,29 +295,27 @@ static Plugin * loadPlugin(const char * name,
     LOG(LOG_WARNING,
         _("Failed to load plugin '%s'\n"),
         name);
-    return next;
+    return;
   }
   p = MALLOC(sizeof(Plugin));
   p->name = STRDUP(name);
-  p->next = next;
+  p->next = plugin;
   p->library = lib;
+  plugin = p;
   init = trybindDynamicMethod(lib,
                               "init_",
                               name);
   if (init != NULL)
     init();
-
-  return p;
 }
 
-static Plugin * loadPlugins(const char * names,
-                            Plugin * plug) {
+static void loadPlugins(const char * names) {
   char * dup;
   char * next;
   const char * pos;
 
   if (names == NULL)
-    return plug;
+    return;
 
   dup = STRDUP(names);
   next = dup;
@@ -338,11 +336,10 @@ static Plugin * loadPlugins(const char * names,
       LOG(LOG_DEBUG,
           "Loading plugin '%s'\n",
           pos);
-      plug = loadPlugin(pos, plug);
+      loadPlugin(pos);
     }
   } while (next != NULL);
   FREE(dup);
-  return plug;
 }
 
 static void unloadPlugin(Plugin * plug) {
@@ -392,7 +389,7 @@ void initGNUnetGTKCommon() {
                                 "PLUGINS");
   if (load == NULL)
     load = STRDUP("about daemon fs");
-  plugin = loadPlugins(load, NULL);
+  loadPlugins(load);
   FREE(load);
 
   connectGladeWithPlugins(mainXML);