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()

6 files changed, 12 insertions, 29 deletions

diff --git a/src/conversation/gnunet-conversation-test.c b/src/conversation/gnunet-conversation-test.c
index 1c8fe74e6..fe6eae925 100644
--- a/src/conversation/gnunet-conversation-test.c
+++ b/src/conversation/gnunet-conversation-test.c
@@ -96,11 +96,9 @@ static struct Recording *rec_tail;
  * Terminate test.
  *
  * @param cls NULL
- * @param tc unused
  */
 static void
-do_shutdown (void *cls,
-             const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_shutdown (void *cls)
 {
   struct Recording *rec;
 
@@ -126,11 +124,9 @@ do_shutdown (void *cls,
  * Terminate recording process and switch to playback.
  *
  * @param cls NULL
- * @param tc unused
  */
 static void
-switch_to_speaker (void *cls,
-                   const struct GNUNET_SCHEDULER_TaskContext *tc)
+switch_to_speaker (void *cls)
 {
   struct Recording *rec;
 
diff --git a/src/conversation/gnunet-conversation.c b/src/conversation/gnunet-conversation.c
index 3b50c8043..9000bcf3f 100644
--- a/src/conversation/gnunet-conversation.c
+++ b/src/conversation/gnunet-conversation.c
@@ -1020,11 +1020,9 @@ do_help (const char *args)
  * Task run during shutdown.
  *
  * @param cls NULL
- * @param tc unused
  */
 static void
-do_stop_task (void *cls,
-              const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_stop_task (void *cls)
 {
 #ifdef WINDOWS
   if (NULL != stdin_hlp)
@@ -1132,11 +1130,9 @@ console_reader_chars (void *cls,
  * Task to handle commands from the terminal.
  *
  * @param cls NULL
- * @param tc scheduler context
  */
 static void
-handle_command (void *cls,
-                const struct GNUNET_SCHEDULER_TaskContext *tc)
+handle_command (void *cls)
 {
   char message[MAX_MESSAGE_LENGTH + 1];
 
diff --git a/src/conversation/gnunet-service-conversation.c b/src/conversation/gnunet-service-conversation.c
index 8761ed5e1..fdaa2999c 100644
--- a/src/conversation/gnunet-service-conversation.c
+++ b/src/conversation/gnunet-service-conversation.c
@@ -1463,11 +1463,9 @@ handle_client_disconnect (void *cls,
  * Shutdown nicely
  *
  * @param cls closure, NULL
- * @param tc the task context
  */
 static void
-do_shutdown (void *cls,
-             const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_shutdown (void *cls)
 {
   struct Line *line;
   struct Channel *ch;
diff --git a/src/conversation/test_conversation_api.c b/src/conversation/test_conversation_api.c
index 317818c8e..f8159115b 100644
--- a/src/conversation/test_conversation_api.c
+++ b/src/conversation/test_conversation_api.c
@@ -73,8 +73,7 @@ static struct GNUNET_SCHEDULER_Task * call_task;
 
 
 static void
-phone_send (void *cls,
-            const struct GNUNET_SCHEDULER_TaskContext *tc)
+phone_send (void *cls)
 {
   static unsigned int i;
   char buf[32];
@@ -88,8 +87,7 @@ phone_send (void *cls,
 
 
 static void
-call_send (void *cls,
-            const struct GNUNET_SCHEDULER_TaskContext *tc)
+call_send (void *cls)
 {
   static unsigned int i;
   char buf[32];
@@ -272,10 +270,9 @@ static struct GNUNET_MICROPHONE_Handle phone_mic = {
  * Signature of the main function of a task.
  *
  * @param cls closure
- * @param tc context information (why was this task triggered now)
  */
 static void
-end_test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+end_test (void *cls)
 {
   GNUNET_SCHEDULER_shutdown ();
   if (NULL != op)
diff --git a/src/conversation/test_conversation_api_reject.c b/src/conversation/test_conversation_api_reject.c
index 13dfcd3d5..5f1f836f7 100644
--- a/src/conversation/test_conversation_api_reject.c
+++ b/src/conversation/test_conversation_api_reject.c
@@ -130,10 +130,9 @@ static struct GNUNET_MICROPHONE_Handle call_mic = {
  * Signature of the main function of a task.
  *
  * @param cls closure
- * @param tc context information (why was this task triggered now)
  */
 static void
-end_test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+end_test (void *cls)
 {
   GNUNET_SCHEDULER_shutdown ();
   if (NULL != op)
diff --git a/src/conversation/test_conversation_api_twocalls.c b/src/conversation/test_conversation_api_twocalls.c
index 5d7e56d95..17a12eb4f 100644
--- a/src/conversation/test_conversation_api_twocalls.c
+++ b/src/conversation/test_conversation_api_twocalls.c
@@ -124,8 +124,7 @@ static struct MicContext call2_mic_ctx;
 
 
 static void
-phone_send (void *cls,
-            const struct GNUNET_SCHEDULER_TaskContext *tc)
+phone_send (void *cls)
 {
   char buf[32];
 
@@ -138,8 +137,7 @@ phone_send (void *cls,
 
 
 static void
-call_send (void *cls,
-           const struct GNUNET_SCHEDULER_TaskContext *tc)
+call_send (void *cls)
 {
   struct MicContext *mc = cls;
   char buf[32];
@@ -343,10 +341,9 @@ static struct GNUNET_MICROPHONE_Handle phone_mic = {
  * Signature of the main function of a task.
  *
  * @param cls closure
- * @param tc context information (why was this task triggered now)
  */
 static void
-end_test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+end_test (void *cls)
 {
   GNUNET_SCHEDULER_shutdown ();
   if (NULL != op)