Add missing include

[oweals/gnunet.git] / src / datastore / test_plugin_datastore.c

diff --git a/src/datastore/test_plugin_datastore.c b/src/datastore/test_plugin_datastore.c
index de9e7c2ab6d6fcf2d62bc88d21e247db9b2a6906..844d32a7be019a0c1050b420039bd1c924149028 100644 (file)
--- a/src/datastore/test_plugin_datastore.c
+++ b/src/datastore/test_plugin_datastore.c
@@ -27,6 +27,7 @@
 #include "gnunet_util_lib.h"
 #include "gnunet_protocols.h"
 #include "gnunet_datastore_plugin.h"
+#include "gnunet_testing_lib.h"
 
 /**
  * Number of put operations to perform.
@@ -83,11 +84,11 @@ disk_utilization_change_cb (void *cls, int delta)
 
 
 static void
-gen_key (int i, GNUNET_HashCode * key)
+gen_key (int i, struct GNUNET_HashCode * key)
 {
-  memset (key, 0, sizeof (GNUNET_HashCode));
+  memset (key, 0, sizeof (struct GNUNET_HashCode));
   key->bits[0] = (unsigned int) i;
-  GNUNET_CRYPTO_hash (key, sizeof (GNUNET_HashCode), key);
+  GNUNET_CRYPTO_hash (key, sizeof (struct GNUNET_HashCode), key);
 }
 
 
@@ -96,7 +97,7 @@ put_value (struct GNUNET_DATASTORE_PluginFunctions *api, int i, int k)
 {
   char value[65536];
   size_t size;
-  GNUNET_HashCode key;
+  struct GNUNET_HashCode key;
   char *msg;
   unsigned int prio;
 
@@ -146,7 +147,7 @@ static uint64_t guid;
 
 
 static int
-iterate_one_shot (void *cls, const GNUNET_HashCode * key, uint32_t size,
+iterate_one_shot (void *cls, const struct GNUNET_HashCode * key, uint32_t size,
                   const void *data, enum GNUNET_BLOCK_Type type,
                   uint32_t priority, uint32_t anonymity,
                   struct GNUNET_TIME_Absolute expiration, uint64_t uid)
@@ -157,8 +158,9 @@ iterate_one_shot (void *cls, const GNUNET_HashCode * key, uint32_t size,
   guid = uid;
   crc->phase++;
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-             "Found result type=%u, priority=%u, size=%u, expire=%llu, key %s\n",
-             type, priority, size, (unsigned long long) expiration.abs_value,
+             "Found result type=%u, priority=%u, size=%u, expire=%s, key %s\n",
+             type, priority, size,
+             GNUNET_STRINGS_absolute_time_to_string (expiration),
              GNUNET_h2s (key));
   GNUNET_SCHEDULER_add_now (&test, crc);
   return GNUNET_OK;
@@ -217,14 +219,14 @@ test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   int j;
   unsigned long long os;
   unsigned long long cs;
-  GNUNET_HashCode key;
+  struct GNUNET_HashCode key;
 
   if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Test aborted.\n");
     crc->phase = RP_ERROR;
   }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
              "In phase %d, iteration %u\n", crc->phase, crc->cnt);
   switch (crc->phase)
   {
@@ -319,6 +321,8 @@ load_plugin (const struct GNUNET_CONFIGURATION_Handle *cfg)
   if (NULL == (ret = GNUNET_PLUGIN_load (libname, &env)))
   {
     FPRINTF (stderr, "Failed to load plugin `%s'!\n", name);
+    GNUNET_free (libname);
+    GNUNET_free (name);
     return NULL;
   }
   GNUNET_free (libname);
@@ -349,11 +353,9 @@ run (void *cls, char *const *args, const char *cfgfile,
 }
 
 
-
 int
 main (int argc, char *argv[])
 {
-  char *pos;
   char dir_name[128];
   char cfg_name[128];
   char *const xargv[] = {
@@ -367,14 +369,7 @@ main (int argc, char *argv[])
   };
 
   /* determine name of plugin to use */
-  plugin_name = argv[0];
-  while (NULL != (pos = strstr (plugin_name, "_")))
-    plugin_name = pos + 1;
-  if (NULL != (pos = strstr (plugin_name, ".")))
-    pos[0] = 0;
-  else
-    pos = (char *) plugin_name;
-
+  plugin_name = GNUNET_TESTING_get_testname_from_underscore (argv[0]);
   GNUNET_snprintf (dir_name, sizeof (dir_name),
                    "/tmp/test-gnunet-datastore-plugin-%s", plugin_name);
   GNUNET_DISK_directory_remove (dir_name);
@@ -385,10 +380,8 @@ main (int argc, char *argv[])
                    "test_plugin_datastore_data_%s.conf", plugin_name);
   GNUNET_PROGRAM_run ((sizeof (xargv) / sizeof (char *)) - 1, xargv,
                       "test-plugin-datastore", "nohelp", options, &run, NULL);
-  if (ok != 0)
+  if (0 != ok)
     FPRINTF (stderr, "Missed some testcases: %u\n", ok);
-  if (pos != plugin_name)
-    pos[0] = '.';
   GNUNET_DISK_directory_remove (dir_name);
   return ok;
 }