-more libexec fixes for OpenSUSE

[oweals/gnunet.git] / src / util / test_plugin.c

diff --git a/src/util/test_plugin.c b/src/util/test_plugin.c
index dc34841f5567de435f6bc78c5685a8312807b052..f2abfa77d79cd35bc9ff84bdb375c3d070f90750 100644 (file)
--- a/src/util/test_plugin.c
+++ b/src/util/test_plugin.c
@@ -24,24 +24,27 @@
 #include "platform.h"
 #include "gnunet_plugin_lib.h"
 
-#define VERBOSE GNUNET_EXTRA_LOGGING
 
 static void
-test_cb (void *cls,
-        const char *libname,
-        void *lib_ret)
+test_cb (void *cls, const char *libname, void *lib_ret)
 {
+  void *ret;
+
   GNUNET_assert (0 == strcmp (cls, "test"));
   GNUNET_assert (0 == strcmp (lib_ret, "Hello"));
-  GNUNET_assert (0 == strcmp (GNUNET_PLUGIN_unload (libname, "out"), "World"));
+  ret = GNUNET_PLUGIN_unload (libname, "out");
+  GNUNET_assert (NULL != ret);
+  GNUNET_assert (0 == strcmp (ret, "World"));
+  GNUNET_free (ret);
 }
-        
 
-static int
-check ()
+
+int
+main (int argc, char *argv[])
 {
   void *ret;
 
+  GNUNET_log_setup ("test-plugin", "WARNING", NULL);
   GNUNET_log_skip (1, GNUNET_NO);
   ret = GNUNET_PLUGIN_load ("libgnunet_plugin_missing", NULL);
   GNUNET_log_skip (0, GNUNET_NO);
@@ -50,7 +53,7 @@ check ()
   ret = GNUNET_PLUGIN_load ("libgnunet_plugin_test", "in");
   if (ret == NULL)
     return 1;
-  if (0 != strcmp (ret, "Hello"))
+  if (0 != strcmp (ret, "Hello"))    
     return 2;
   ret = GNUNET_PLUGIN_unload ("libgnunet_plugin_test", "out");
   if (ret == NULL)
@@ -58,20 +61,8 @@ check ()
   if (0 != strcmp (ret, "World"))
     return 4;
   free (ret);
-
   GNUNET_PLUGIN_load_all ("libgnunet_plugin_tes", "in", &test_cb, "test");
   return 0;
 }
 
-int
-main (int argc, char *argv[])
-{
-  int ret;
-
-  GNUNET_log_setup ("test-plugin", "WARNING", NULL);
-  ret = check ();
-
-  return ret;
-}
-
 /* end of test_plugin.c */