2 files changed, 33 insertions, 26 deletions

diff --git a/src/social/gnunet-service-social.c b/src/social/gnunet-service-social.c
index 1746a82ca..03a113d7e 100644
--- a/src/social/gnunet-service-social.c
+++ b/src/social/gnunet-service-social.c
@@ -408,8 +408,13 @@ static int
 psyc_transmit_message (struct Place *plc);
 
 
+/**
+ * Clean up place data structures after a client disconnected.
+ *
+ * @param cls the `struct Place` to clean up
+ */
 static void
-cleanup_place (struct Place *plc);
+cleanup_place (void *cls);
 
 
 static struct MessageTransmitQueue *
@@ -426,7 +431,9 @@ place_entry_cleanup (void *cls,
                      const struct GNUNET_HashCode *key,
                      void *value)
 {
-  cleanup_place (value);
+  struct Place *plc = value;
+  
+  cleanup_place (plc);
   return GNUNET_YES;
 }
 
@@ -524,10 +531,14 @@ cleanup_guest (struct Guest *gst)
 
 /**
  * Clean up place data structures after a client disconnected.
+ *
+ * @param cls the `struct Place` to clean up
  */
 static void
-cleanup_place (struct Place *plc)
+cleanup_place (void *cls)
 {
+  struct Place *plc = cls;
+  
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "%p Cleaning up place %s\n",
               plc, GNUNET_h2s (&plc->pub_key_hash));
@@ -541,13 +552,6 @@ cleanup_place (struct Place *plc)
 }
 
 
-static void
-schedule_cleanup_place (void *cls)
-{
-  cleanup_place (cls);
-}
-
-
 /**
  * Called whenever a client is disconnected.
  * Frees our resources associated with that client.
@@ -2329,7 +2333,7 @@ psyc_transmit_notify_data (void *cls, uint16_t *data_size, void *data)
     tmit_msg = psyc_transmit_queue_next_msg (plc, tmit_msg);
     plc->is_disconnected = GNUNET_YES;
     GNUNET_SERVER_client_disconnect (tmit_frag->client);
-    GNUNET_SCHEDULER_add_now (&schedule_cleanup_place, plc);
+    GNUNET_SCHEDULER_add_now (&cleanup_place, plc);
     return ret;
   }
   else
@@ -2489,7 +2493,7 @@ psyc_transmit_notify_mod (void *cls, uint16_t *data_size, void *data,
     tmit_msg = psyc_transmit_queue_next_msg (plc, tmit_msg);
     plc->is_disconnected = GNUNET_YES;
     GNUNET_SERVER_client_disconnect (tmit_frag->client);
-    GNUNET_SCHEDULER_add_now (&schedule_cleanup_place, plc);
+    GNUNET_SCHEDULER_add_now (&cleanup_place, plc);
   }
   else
   {
@@ -3480,8 +3484,7 @@ run (void *cls, struct GNUNET_SERVER_Handle *server,
   nc = GNUNET_SERVER_notification_context_create (server, 1);
   GNUNET_SERVER_add_handlers (server, handlers);
   GNUNET_SERVER_disconnect_notify (server, &client_disconnect, NULL);
-  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
-                                &shutdown_task, NULL);
+  GNUNET_SCHEDULER_add_shutdown (&shutdown_task, NULL);
 }
 
 
diff --git a/src/social/test_social.c b/src/social/test_social.c
index 5eeb20196..e2639f4d6 100644
--- a/src/social/test_social.c
+++ b/src/social/test_social.c
@@ -267,16 +267,17 @@ end ()
     GNUNET_SCHEDULER_cancel (end_badly_task);
     end_badly_task = NULL;
   }
-  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MILLISECONDS,
-                                &end_normally, NULL);
+  GNUNET_SCHEDULER_add_now (&end_normally, NULL);
 }
 
 
 static void
 transmit_resume (void *cls)
 {
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Transmission resumed.\n");
   struct TransmitClosure *tmit = cls;
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Transmission resumed.\n");
   if (NULL != tmit->host_ann)
     GNUNET_SOCIAL_host_announce_resume (tmit->host_ann);
   else
@@ -357,14 +358,14 @@ host_farewell2 (void *cls,
 {
   GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
               "Nym left the place again.\n");
-  GNUNET_SCHEDULER_add_now (schedule_host_leave, NULL);
+  GNUNET_SCHEDULER_add_now (&schedule_host_leave, NULL);
 }
 
 
 static void
 host_reconnected (void *cls, int result,
-              const struct GNUNET_CRYPTO_EddsaPublicKey *home_pub_key,
-              uint64_t max_message_id)
+                  const struct GNUNET_CRYPTO_EddsaPublicKey *home_pub_key,
+                  uint64_t max_message_id)
 {
   place_pub_key = *home_pub_key;
   GNUNET_CRYPTO_hash (&place_pub_key, sizeof (place_pub_key), &place_pub_hash);
@@ -375,7 +376,7 @@ host_reconnected (void *cls, int result,
   is_host_reconnected = GNUNET_YES;
   if (GNUNET_YES == is_guest_reconnected)
   {
-    GNUNET_SCHEDULER_add_now (schedule_guest_leave, NULL);
+    GNUNET_SCHEDULER_add_now (&schedule_guest_leave, NULL);
   }
 }
 
@@ -393,7 +394,7 @@ guest_reconnected (void *cls, int result,
   is_guest_reconnected = GNUNET_YES;
   if (GNUNET_YES == is_host_reconnected)
   {
-    GNUNET_SCHEDULER_add_now (schedule_guest_leave, NULL);
+    GNUNET_SCHEDULER_add_now (&schedule_guest_leave, NULL);
   }
 }
 
@@ -583,8 +584,10 @@ schedule_guest_leave (void *cls)
 
 
 static void
-guest_look_for_result (void *cls, int64_t result_code,
-                      const void *data, uint16_t data_size)
+guest_look_for_result (void *cls,
+                       int64_t result_code,
+                       const void *data,
+                       uint16_t data_size)
 {
   struct ResultClosure *rcls = cls;
   GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
@@ -1047,7 +1050,7 @@ guest_recv_entry_decision (void *cls,
     break;
 
   case TEST_GUEST_ENTER_BY_NAME:
-    GNUNET_SCHEDULER_add_now (schedule_reconnect, NULL);
+    GNUNET_SCHEDULER_add_now (&schedule_reconnect, NULL);
     break;
 
   default:
@@ -1313,7 +1316,8 @@ run (void *cls,
 #endif
 {
   cfg = c;
-  end_badly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
+  end_badly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
+                                                 &end_badly, NULL);
 
   core = GNUNET_CORE_connect (cfg, NULL, &core_connected, NULL, NULL,
                               NULL, GNUNET_NO, NULL, GNUNET_NO, NULL);