removing fprintfs -- with bad %fmt statements giving warnings

[oweals/gnunet.git] / src / peerinfo / test_peerinfo_api.c

diff --git a/src/peerinfo/test_peerinfo_api.c b/src/peerinfo/test_peerinfo_api.c
index a3c2c99eb98d91a813ad435706c78890dad54f7d..fdd0dc46051a862e83be5aca5f5953d2dc1cf978 100644 (file)
--- a/src/peerinfo/test_peerinfo_api.c
+++ b/src/peerinfo/test_peerinfo_api.c
@@ -36,8 +36,6 @@
 #include "gnunet_time_lib.h"
 #include "peerinfo.h"
 
-static struct GNUNET_SCHEDULER_Handle *sched;
-
 static const struct GNUNET_CONFIGURATION_Handle *cfg;
 
 static struct GNUNET_PEERINFO_IteratorContext *ic;
@@ -143,14 +141,13 @@ process (void *cls,
 
 static void
 run (void *cls,
-     struct GNUNET_SCHEDULER_Handle *s,
      char *const *args,
      const char *cfgfile, 
      const struct GNUNET_CONFIGURATION_Handle *c)
 {
-  sched = s;
   cfg = c;
-  h = GNUNET_PEERINFO_connect (sched, cfg);
+  h = GNUNET_PEERINFO_connect (cfg);
+  GNUNET_assert (h != NULL);
   add_peer ();
   ic = GNUNET_PEERINFO_iterate (h,
                                NULL,
@@ -164,7 +161,7 @@ static int
 check ()
 {
   int ok = 3;
-  pid_t pid;
+  struct GNUNET_OS_Process *proc;
   char *const argv[] = { "test-peerinfo-api",
     "-c",
     "test_peerinfo_api_data.conf",
@@ -176,7 +173,7 @@ check ()
   struct GNUNET_GETOPT_CommandLineOption options[] = {
     GNUNET_GETOPT_OPTION_END
   };
-  pid = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-peerinfo",
+  proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-peerinfo",
                                  "gnunet-service-peerinfo",
 #if DEBUG_PEERINFO
                                  "-L", "DEBUG",
@@ -185,12 +182,14 @@ check ()
   GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
                       argv, "test-peerinfo-api", "nohelp",
                       options, &run, &ok);
-  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;
   return ok;
 }