spell out message types more, use correct conversion direction

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

diff --git a/src/identity/gnunet-identity.c b/src/identity/gnunet-identity.c
index 574586b40bad4344cab5752ce1070b5d2a89018a..f632aa0a8d76979ee8d9c0d237e85858506eedb3 100644 (file)
--- a/src/identity/gnunet-identity.c
+++ b/src/identity/gnunet-identity.c
@@ -84,11 +84,9 @@ static struct GNUNET_IDENTITY_Operation *delete_op;
  * Task run on shutdown.
  *
  * @param cls NULL
- * @param tc unused
  */
 static void
-shutdown_task (void *cls,
-              const struct GNUNET_SCHEDULER_TaskContext *tc)
+shutdown_task (void *cls)
 {
   if (NULL != set_op)
   {
@@ -304,8 +302,7 @@ run (void *cls, char *const *args, const char *cfgfile,
                                        create_ego,
                                        &create_finished,
                                        &create_op);
-  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
-                               &shutdown_task, NULL);
+  GNUNET_SCHEDULER_add_shutdown (&shutdown_task, NULL);
   test_finished ();
 }
 
@@ -338,7 +335,7 @@ main (int argc, char *const *argv)
     {'m', "monitor", NULL,
      gettext_noop ("run in monitor mode egos"),
      0, &GNUNET_GETOPT_set_one, &monitor},
-    {'s', "set", "SUBSYSYSTEM",
+    {'s', "set", "SUBSYSTEM",
      gettext_noop ("set default identity to EGO for a subsystem SUBSYSTEM (use together with -e)"),
      1, &GNUNET_GETOPT_set_string, &set_subsystem},
     GNUNET_GETOPT_OPTION_END