removing "unused variable" error

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

diff --git a/src/datastore/test_datastore_api.c b/src/datastore/test_datastore_api.c
index 10a195cfb10eae5ef5efbeb7c3d70c7bce3a673c..2edc9a6ecb4c004cac8e2d0534542775cc58b68b 100644 (file)
--- a/src/datastore/test_datastore_api.c
+++ b/src/datastore/test_datastore_api.c
@@ -95,7 +95,7 @@ get_expiration (int i)
 {
   struct GNUNET_TIME_Absolute av;
 
-  av.value = now.value + 20000000 - i * 1000;
+  av.abs_value = now.abs_value + 20000000 - i * 1000;
   return av;
 }
 
@@ -125,7 +125,6 @@ struct CpsRunContext
   GNUNET_HashCode key;
   int i;
   int rid;
-  struct GNUNET_SCHEDULER_Handle *sched;
   const struct GNUNET_CONFIGURATION_Handle *cfg;
   void *data;
   size_t size;
@@ -150,13 +149,12 @@ check_success (void *cls,
       ok = 42;
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                  "%s\n", msg);
-      GNUNET_SCHEDULER_shutdown (crc->sched);
+      GNUNET_SCHEDULER_shutdown ();
       return;
     }
   GNUNET_free_non_null (crc->data);
   crc->data = NULL;
-  GNUNET_SCHEDULER_add_continuation (crc->sched,
-                                    &run_continuation,
+  GNUNET_SCHEDULER_add_continuation (&run_continuation,
                                     crc,
                                     GNUNET_SCHEDULER_REASON_PREREQ_DONE);
 }
@@ -173,8 +171,7 @@ get_reserved (void *cls,
                "%s\n", msg);
   GNUNET_assert (0 < success);
   crc->rid = success;
-  GNUNET_SCHEDULER_add_continuation (crc->sched,
-                                    &run_continuation,
+  GNUNET_SCHEDULER_add_continuation (&run_continuation,
                                     crc,
                                     GNUNET_SCHEDULER_REASON_PREREQ_DONE);
 }
@@ -201,8 +198,7 @@ check_value (void *cls,
          crc->phase = RP_DEL;
          crc->i = ITERATIONS;
        }
-      GNUNET_SCHEDULER_add_continuation (crc->sched,
-                                        &run_continuation,
+      GNUNET_SCHEDULER_add_continuation (&run_continuation,
                                         crc,
                                         GNUNET_SCHEDULER_REASON_PREREQ_DONE);
       return;
@@ -213,7 +209,7 @@ check_value (void *cls,
   GNUNET_assert (type == get_type (i));
   GNUNET_assert (priority == get_priority (i));
   GNUNET_assert (anonymity == get_anonymity(i));
-  GNUNET_assert (expiration.value == get_expiration(i).value);
+  GNUNET_assert (expiration.abs_value == get_expiration(i).abs_value);
   GNUNET_DATASTORE_get_next (datastore, GNUNET_YES);
 }
 
@@ -243,8 +239,7 @@ delete_value (void *cls,
        {
          crc->phase = RP_DO_DEL;
        }
-      GNUNET_SCHEDULER_add_continuation (crc->sched,
-                                        &run_continuation,
+      GNUNET_SCHEDULER_add_continuation (&run_continuation,
                                         crc,
                                         GNUNET_SCHEDULER_REASON_PREREQ_DONE);
       return;
@@ -275,8 +270,7 @@ check_nothing (void *cls,
     {
       crc->phase = RP_RESERVE;   
     }
-  GNUNET_SCHEDULER_add_continuation (crc->sched,
-                                    &run_continuation,
+  GNUNET_SCHEDULER_add_continuation (&run_continuation,
                                     crc,
                                     GNUNET_SCHEDULER_REASON_PREREQ_DONE);
 }
@@ -309,8 +303,7 @@ check_multiple (void *cls,
        {
          crc->phase = RP_UPDATE;
        }
-      GNUNET_SCHEDULER_add_continuation (crc->sched,
-                                        &run_continuation,
+      GNUNET_SCHEDULER_add_continuation (&run_continuation,
                                         crc,
                                         GNUNET_SCHEDULER_REASON_PREREQ_DONE);
       return;
@@ -364,8 +357,7 @@ check_update (void *cls,
        {
          crc->phase = RP_DONE;
        }
-      GNUNET_SCHEDULER_add_continuation (crc->sched,
-                                        &run_continuation,
+      GNUNET_SCHEDULER_add_continuation (&run_continuation,
                                         crc,
                                         GNUNET_SCHEDULER_REASON_PREREQ_DONE);
       return;
@@ -597,8 +589,7 @@ run_tests (void *cls,
       GNUNET_free (crc);
       return;
     }
-  GNUNET_SCHEDULER_add_continuation (crc->sched,
-                                    &run_continuation,
+  GNUNET_SCHEDULER_add_continuation (&run_continuation,
                                     crc,
                                     GNUNET_SCHEDULER_REASON_PREREQ_DONE);
 }
@@ -606,7 +597,6 @@ run_tests (void *cls,
 
 static void
 run (void *cls,
-     struct GNUNET_SCHEDULER_Handle *sched,
      char *const *args,
      const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *cfg)
@@ -615,11 +605,10 @@ run (void *cls,
   static GNUNET_HashCode zkey;
 
   crc = GNUNET_malloc(sizeof(struct CpsRunContext));
-  crc->sched = sched;
   crc->cfg = cfg;
   crc->phase = RP_PUT;
   now = GNUNET_TIME_absolute_get ();
-  datastore = GNUNET_DATASTORE_connect (cfg, sched);
+  datastore = GNUNET_DATASTORE_connect (cfg);
   if (NULL ==
       GNUNET_DATASTORE_put (datastore, 0,
                            &zkey, 4, "TEST",
@@ -641,7 +630,7 @@ check ()
 {
   char cfg_name[128];
 #if START_DATASTORE
-  pid_t pid;
+  struct GNUNET_OS_Process *proc;
 #endif
   char *const argv[] = {
     "test-datastore-api",
@@ -660,7 +649,7 @@ check ()
                   "test_datastore_api_data_%s.conf",
                   plugin_name);
 #if START_DATASTORE
-  pid = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm",
+  proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm",
                                  "gnunet-service-arm",
 #if VERBOSE
                                  "-L", "DEBUG",
@@ -671,12 +660,14 @@ check ()
                       argv, "test-datastore-api", "nohelp",
                       options, &run, NULL);
 #if START_DATASTORE
-  if (0 != PLIBC_KILL (pid, SIGTERM))
+  if (0 != GNUNET_OS_process_kill (proc, SIGTERM))
     {
       GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
       ok = 1;
     }
-  GNUNET_OS_process_wait(pid);
+  GNUNET_OS_process_wait (proc);
+  GNUNET_OS_process_close (proc);
+  proc = NULL;
 #endif
   if (ok != 0)
     fprintf (stderr, "Missed some testcases: %u\n", ok);
@@ -687,13 +678,17 @@ int
 main (int argc, char *argv[])
 {
   int ret;
-  const char *pos;
+  char *pos;
   char dir_name[128];
 
   /* 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;
 
   GNUNET_snprintf (dir_name,
                   sizeof (dir_name),
@@ -708,6 +703,8 @@ main (int argc, char *argv[])
 #endif
                     NULL);
   ret = check ();
+  if (pos != plugin_name)
+    pos[0] = '.';
   GNUNET_DISK_directory_remove (dir_name);
   return ret;
 }