converting to GNUNET_LOG_from*

1 files changed, 60 insertions, 58 deletions

diff --git a/src/util/plugin.c b/src/util/plugin.c
index dbd3519aa..77631410c 100644
--- a/src/util/plugin.c
+++ b/src/util/plugin.c
@@ -30,6 +30,8 @@
 #include "gnunet_os_lib.h"
 #include "gnunet_plugin_lib.h"
 
+#define LOG(kind,...) GNUNET_log_from (kind, "util", __VA_ARGS__)
+
 /**
  * Linked list of active plugins.
  */
@@ -83,30 +85,30 @@ plugin_init ()
 
   err = lt_dlinit ();
   if (err > 0)
-  {
-    fprintf (stderr, _("Initialization of plugin mechanism failed: %s!\n"),
-             lt_dlerror ());
-    return;
-  }
+    {
+      fprintf (stderr, _("Initialization of plugin mechanism failed: %s!\n"),
+               lt_dlerror ());
+      return;
+    }
   opath = lt_dlgetsearchpath ();
   if (opath != NULL)
     old_dlsearchpath = GNUNET_strdup (opath);
   path = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_LIBDIR);
   if (path != NULL)
-  {
-    if (opath != NULL)
     {
-      GNUNET_asprintf (&cpath, "%s:%s", opath, path);
-      lt_dlsetsearchpath (cpath);
-      GNUNET_free (path);
-      GNUNET_free (cpath);
+      if (opath != NULL)
+        {
+          GNUNET_asprintf (&cpath, "%s:%s", opath, path);
+          lt_dlsetsearchpath (cpath);
+          GNUNET_free (path);
+          GNUNET_free (cpath);
+        }
+      else
+        {
+          lt_dlsetsearchpath (path);
+          GNUNET_free (path);
+        }
     }
-    else
-    {
-      lt_dlsetsearchpath (path);
-      GNUNET_free (path);
-    }
-  }
 }
 
 
@@ -118,10 +120,10 @@ plugin_fini ()
 {
   lt_dlsetsearchpath (old_dlsearchpath);
   if (old_dlsearchpath != NULL)
-  {
-    GNUNET_free (old_dlsearchpath);
-    old_dlsearchpath = NULL;
-  }
+    {
+      GNUNET_free (old_dlsearchpath);
+      old_dlsearchpath = NULL;
+    }
   lt_dlexit ();
 }
 
@@ -140,9 +142,9 @@ resolve_function (struct PluginList *plug, const char *name)
   if (mptr == NULL)
     mptr = lt_dlsym (plug->handle, initName);
   if (mptr == NULL)
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                _("`%s' failed to resolve method '%s' with error: %s\n"),
-                "lt_dlsym", &initName[1], lt_dlerror ());
+    LOG (GNUNET_ERROR_TYPE_ERROR,
+         _("`%s' failed to resolve method '%s' with error: %s\n"),
+         "lt_dlsym", &initName[1], lt_dlerror ());
   GNUNET_free (initName);
   return mptr;
 }
@@ -164,10 +166,10 @@ GNUNET_PLUGIN_test (const char *library_name)
   struct PluginList plug;
 
   if (!initialized)
-  {
-    initialized = GNUNET_YES;
-    plugin_init ();
-  }
+    {
+      initialized = GNUNET_YES;
+      plugin_init ();
+    }
   libhandle = lt_dlopenext (library_name);
   if (libhandle == NULL)
     return GNUNET_NO;
@@ -175,11 +177,11 @@ GNUNET_PLUGIN_test (const char *library_name)
   plug.name = (char *) library_name;
   init = resolve_function (&plug, "init");
   if (init == NULL)
-  {
-    GNUNET_break (0);
-    lt_dlclose (libhandle);
-    return GNUNET_NO;
-  }
+    {
+      GNUNET_break (0);
+      lt_dlclose (libhandle);
+      return GNUNET_NO;
+    }
   lt_dlclose (libhandle);
   return GNUNET_YES;
 }
@@ -206,18 +208,18 @@ GNUNET_PLUGIN_load (const char *library_name, void *arg)
   void *ret;
 
   if (!initialized)
-  {
-    initialized = GNUNET_YES;
-    plugin_init ();
-  }
+    {
+      initialized = GNUNET_YES;
+      plugin_init ();
+    }
   libhandle = lt_dlopenext (library_name);
   if (libhandle == NULL)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                _("`%s' failed for library `%s' with error: %s\n"),
-                "lt_dlopenext", library_name, lt_dlerror ());
-    return NULL;
-  }
+    {
+      LOG (GNUNET_ERROR_TYPE_ERROR,
+           _("`%s' failed for library `%s' with error: %s\n"),
+           "lt_dlopenext", library_name, lt_dlerror ());
+      return NULL;
+    }
   plug = GNUNET_malloc (sizeof (struct PluginList));
   plug->handle = libhandle;
   plug->name = GNUNET_strdup (library_name);
@@ -225,13 +227,13 @@ GNUNET_PLUGIN_load (const char *library_name, void *arg)
   plugins = plug;
   init = resolve_function (plug, "init");
   if ((init == NULL) || (NULL == (ret = init (arg))))
-  {
-    lt_dlclose (libhandle);
-    GNUNET_free (plug->name);
-    plugins = plug->next;
-    GNUNET_free (plug);
-    return NULL;
-  }
+    {
+      lt_dlclose (libhandle);
+      GNUNET_free (plug->name);
+      plugins = plug->next;
+      GNUNET_free (plug);
+      return NULL;
+    }
   return ret;
 }
 
@@ -255,10 +257,10 @@ GNUNET_PLUGIN_unload (const char *library_name, void *arg)
   prev = NULL;
   pos = plugins;
   while ((pos != NULL) && (0 != strcmp (pos->name, library_name)))
-  {
-    prev = pos;
-    pos = pos->next;
-  }
+    {
+      prev = pos;
+      pos = pos->next;
+    }
   if (pos == NULL)
     return NULL;
 
@@ -274,10 +276,10 @@ GNUNET_PLUGIN_unload (const char *library_name, void *arg)
   GNUNET_free (pos->name);
   GNUNET_free (pos);
   if (plugins == NULL)
-  {
-    plugin_fini ();
-    initialized = GNUNET_NO;
-  }
+    {
+      plugin_fini ();
+      initialized = GNUNET_NO;
+    }
   return ret;
 }