plugin datastore mysql

[oweals/gnunet.git] / src / rps / gnunet-rps.c

diff --git a/src/rps/gnunet-rps.c b/src/rps/gnunet-rps.c
index 01be2aeb3c02dac5a61e5eff048bb28609693cbf..3dbb8053e5e4a7494e1d421bddf8429f5a7f467b 100644 (file)
--- a/src/rps/gnunet-rps.c
+++ b/src/rps/gnunet-rps.c
@@ -26,6 +26,7 @@
 #include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_rps_service.h"
+#include <inttypes.h>
 
 static int ret;
 
@@ -45,12 +46,6 @@ static struct GNUNET_RPS_Request_Handle *req_handle;
 static struct GNUNET_PeerIdentity *peer_id;
 
 
-/**
- * Shutdown task
- */
-static struct GNUNET_SCHEDULER_Task *shutdown_task;
-
-
 /**
  * Set an option of type 'struct GNUNET_PeerIdentity *' from the command line.
  * A pointer to this function should be passed as part of the
@@ -96,7 +91,6 @@ GNUNET_GETOPT_set_peerid (struct GNUNET_GETOPT_CommandLineProcessorContext *ctx,
 static void
 do_shutdown (void *cls)
 {
-  shutdown_task = NULL;
   if (NULL != req_handle)
     GNUNET_RPS_request_cancel (req_handle);
   GNUNET_RPS_disconnect (rps_handle);
@@ -126,8 +120,7 @@ reply_handle (void *cls,
   }
   ret = 0;
 
-  GNUNET_SCHEDULER_cancel (shutdown_task);
-  GNUNET_SCHEDULER_add_now (do_shutdown, NULL);
+  GNUNET_SCHEDULER_shutdown ();
 }
 
 
@@ -154,17 +147,16 @@ run (void *cls,
     /* If number was specified use it, else request single peer. */
     num_peers = (NULL == args[0]) ? 1 : atoi (args[0]);
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-        "Requesting %u PeerIDs\n", num_peers);
+        "Requesting %" PRIu64 " PeerIDs\n", num_peers);
     req_handle = GNUNET_RPS_request_peers (rps_handle, num_peers, reply_handle, NULL);
-    shutdown_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
-        &do_shutdown, NULL);
+    GNUNET_SCHEDULER_add_shutdown (&do_shutdown, NULL);
   }
   else
   { /* Seed PeerID */
     GNUNET_RPS_seed_ids (rps_handle, 1, peer_id);
     FPRINTF (stdout, "Seeded PeerID %s\n", GNUNET_i2s_full (peer_id));
     ret = 0;
-    GNUNET_SCHEDULER_add_now (do_shutdown, NULL);
+    GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
   }
 }