diff options
author | Christian Grothoff <christian@grothoff.org> | 2016-04-09 23:14:03 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2016-04-09 23:14:03 +0000 |
commit | 29e6158507a0758192075ac6ece7ba8e75ddc49a (patch) | |
tree | b91ded48da322f8ba4c9bb0f5504228aa036c2d1 /src/multicast | |
parent | 5dfcb058ab5db9ae0c4b147d8a99c64ca0980028 (diff) | |
download | gnunet-29e6158507a0758192075ac6ece7ba8e75ddc49a.tar.gz gnunet-29e6158507a0758192075ac6ece7ba8e75ddc49a.zip |
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()
Diffstat (limited to 'src/multicast')
-rw-r--r-- | src/multicast/gnunet-service-multicast.c | 3 | ||||
-rw-r--r-- | src/multicast/test_multicast.c | 14 |
2 files changed, 7 insertions, 10 deletions
diff --git a/src/multicast/gnunet-service-multicast.c b/src/multicast/gnunet-service-multicast.c index 69a0d3fd7..8041119b0 100644 --- a/src/multicast/gnunet-service-multicast.c +++ b/src/multicast/gnunet-service-multicast.c | |||
@@ -327,10 +327,9 @@ struct ReplayRequestKey | |||
327 | * Task run during shutdown. | 327 | * Task run during shutdown. |
328 | * | 328 | * |
329 | * @param cls unused | 329 | * @param cls unused |
330 | * @param tc unused | ||
331 | */ | 330 | */ |
332 | static void | 331 | static void |
333 | shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 332 | shutdown_task (void *cls) |
334 | { | 333 | { |
335 | if (NULL != core) | 334 | if (NULL != core) |
336 | { | 335 | { |
diff --git a/src/multicast/test_multicast.c b/src/multicast/test_multicast.c index a81c1f379..9550b8894 100644 --- a/src/multicast/test_multicast.c +++ b/src/multicast/test_multicast.c | |||
@@ -132,10 +132,9 @@ cleanup () | |||
132 | * Terminate the test case (failure). | 132 | * Terminate the test case (failure). |
133 | * | 133 | * |
134 | * @param cls NULL | 134 | * @param cls NULL |
135 | * @param tc scheduler context | ||
136 | */ | 135 | */ |
137 | static void | 136 | static void |
138 | end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 137 | end_badly (void *cls) |
139 | { | 138 | { |
140 | res = 1; | 139 | res = 1; |
141 | cleanup (); | 140 | cleanup (); |
@@ -147,10 +146,9 @@ end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
147 | * Terminate the test case (success). | 146 | * Terminate the test case (success). |
148 | * | 147 | * |
149 | * @param cls NULL | 148 | * @param cls NULL |
150 | * @param tc scheduler context | ||
151 | */ | 149 | */ |
152 | static void | 150 | static void |
153 | end_normally (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 151 | end_normally (void *cls) |
154 | { | 152 | { |
155 | res = 0; | 153 | res = 0; |
156 | cleanup (); | 154 | cleanup (); |
@@ -176,8 +174,8 @@ end () | |||
176 | } | 174 | } |
177 | 175 | ||
178 | 176 | ||
179 | void | 177 | static void |
180 | tmit_resume (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 178 | tmit_resume (void *cls) |
181 | { | 179 | { |
182 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Transmission resumed.\n"); | 180 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Transmission resumed.\n"); |
183 | struct TransmitClosure *tmit = cls; | 181 | struct TransmitClosure *tmit = cls; |
@@ -254,7 +252,7 @@ origin_stopped (void *cls) | |||
254 | 252 | ||
255 | 253 | ||
256 | static void | 254 | static void |
257 | schedule_origin_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 255 | schedule_origin_stop (void *cls) |
258 | { | 256 | { |
259 | test = TEST_ORIGIN_STOP; | 257 | test = TEST_ORIGIN_STOP; |
260 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 258 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, |
@@ -290,7 +288,7 @@ member_parted (void *cls) | |||
290 | 288 | ||
291 | 289 | ||
292 | static void | 290 | static void |
293 | schedule_member_part (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 291 | schedule_member_part (void *cls) |
294 | { | 292 | { |
295 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 293 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
296 | "Test #%u: schedule_member_part()\n", test); | 294 | "Test #%u: schedule_member_part()\n", test); |