small API change: do no longer pass rarely needed GNUNET_SCHEDULER_TaskContext to all scheduler tasks; instead, allow the relatively few tasks that need it to obtain the context via GNUNET_SCHEDULER_get_task_context()

2 files changed, 14 insertions, 16 deletions

diff --git a/src/psyc/gnunet-service-psyc.c b/src/psyc/gnunet-service-psyc.c
index 38ec10e4d..2b436aa21 100644
--- a/src/psyc/gnunet-service-psyc.c
+++ b/src/psyc/gnunet-service-psyc.c
@@ -428,10 +428,10 @@ message_queue_drop (struct Channel *chn);
 
 
 static void
-schedule_transmit_message (void *cls,
-                           const struct GNUNET_SCHEDULER_TaskContext *tc)
+schedule_transmit_message (void *cls)
 {
   struct Channel *chn = cls;
+
   transmit_message (chn);
 }
 
@@ -440,10 +440,9 @@ schedule_transmit_message (void *cls,
  * Task run during shutdown.
  *
  * @param cls unused
- * @param tc unused
  */
 static void
-shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+shutdown_task (void *cls)
 {
   if (NULL != nc)
   {
diff --git a/src/psyc/test_psyc.c b/src/psyc/test_psyc.c
index 4aae5e122..1169b49d5 100644
--- a/src/psyc/test_psyc.c
+++ b/src/psyc/test_psyc.c
@@ -158,10 +158,9 @@ cleanup ()
  * Terminate the test case (failure).
  *
  * @param cls NULL
- * @param tc scheduler context
  */
-void
-end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+static void
+end_badly (void *cls)
 {
   res = 1;
   cleanup ();
@@ -173,10 +172,9 @@ end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  * Terminate the test case (success).
  *
  * @param cls NULL
- * @param tc scheduler context
  */
-void
-end_normally (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+static void
+end_normally (void *cls)
 {
   res = 0;
   cleanup ();
@@ -545,8 +543,8 @@ master_history_replay_latest ()
 }
 
 
-void
-transmit_resume (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+static void
+transmit_resume (void *cls)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Transmission resumed.\n");
   struct TransmitClosure *tmit = cls;
@@ -753,8 +751,8 @@ void first_slave_parted (void *cls)
 }
 
 
-void
-schedule_slave_part (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+static void
+schedule_slave_part (void *cls)
 {
   GNUNET_PSYC_slave_part (slv, GNUNET_NO, first_slave_parted, NULL);
 }
@@ -925,8 +923,9 @@ master_start ()
   mst_chn = GNUNET_PSYC_master_get_channel (mst);
 }
 
-void
-schedule_master_start (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+
+static void
+schedule_master_start (void *cls)
 {
   master_start ();
 }