implementing new scheduler shutdown semantics

4 files changed, 9 insertions, 9 deletions

diff --git a/src/identity/gnunet-identity.c b/src/identity/gnunet-identity.c
index dc9174d21..23c20d91f 100644
--- a/src/identity/gnunet-identity.c
+++ b/src/identity/gnunet-identity.c
@@ -302,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 ();
 }
 
diff --git a/src/identity/gnunet-service-identity.c b/src/identity/gnunet-service-identity.c
index d36319a99..9185aac64 100644
--- a/src/identity/gnunet-service-identity.c
+++ b/src/identity/gnunet-service-identity.c
@@ -916,8 +916,8 @@ run (void *cls,
   GNUNET_DISK_directory_scan (ego_directory,
                               &process_ego_file,
                               NULL);
-  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task,
-                                NULL);
+  GNUNET_SCHEDULER_add_shutdown (&shutdown_task,
+                                 NULL);
 }
 
 
diff --git a/src/identity/plugin_rest_identity.c b/src/identity/plugin_rest_identity.c
index 22ade6a0e..5bed8af55 100644
--- a/src/identity/plugin_rest_identity.c
+++ b/src/identity/plugin_rest_identity.c
@@ -257,9 +257,9 @@ cleanup_handle (struct RequestHandle *handle)
 
 
 /**
- * Task run on shutdown.  Cleans up everything.
+ * Task run on errors.  Reports an error and cleans up everything.
  *
- * @param cls unused
+ * @param cls the `struct RequestHandle`
  */
 static void
 do_error (void *cls)
@@ -273,7 +273,9 @@ do_error (void *cls)
                    &handle->emsg);
 
   resp = GNUNET_REST_create_json_response (json_error);
-  handle->proc (handle->proc_cls, resp, MHD_HTTP_BAD_REQUEST);
+  handle->proc (handle->proc_cls,
+                resp,
+                MHD_HTTP_BAD_REQUEST);
   cleanup_handle (handle);
   GNUNET_free (json_error);
 }
diff --git a/src/identity/test_identity.c b/src/identity/test_identity.c
index 6eaa86e91..37065ce08 100644
--- a/src/identity/test_identity.c
+++ b/src/identity/test_identity.c
@@ -110,8 +110,7 @@ end ()
     GNUNET_SCHEDULER_cancel (endbadly_task);
     endbadly_task = NULL;
   }
-  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MILLISECONDS,
-                                &end_normally, NULL);
+  GNUNET_SCHEDULER_add_now (&end_normally, NULL);
 }