Link libgnunetblockgroup to libgnunetblock

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

diff --git a/src/util/test_plugin.c b/src/util/test_plugin.c
index dc34841f5567de435f6bc78c5685a8312807b052..3630886dc9115674294e0bb086b5a68cf4910da1 100644 (file)
--- a/src/util/test_plugin.c
+++ b/src/util/test_plugin.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2009 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2009 GNUnet e.V.
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -14,34 +14,37 @@
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 /**
  * @file util/test_plugin.c
  * @brief testcase for plugin.c
  */
 #include "platform.h"
-#include "gnunet_plugin_lib.h"
+#include "gnunet_util_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"));
+  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);
@@ -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 */