diff options
Diffstat (limited to 'src/social')
-rw-r--r-- | src/social/gnunet-service-social.c | 11 | ||||
-rw-r--r-- | src/social/test_social.c | 17 |
2 files changed, 14 insertions, 14 deletions
diff --git a/src/social/gnunet-service-social.c b/src/social/gnunet-service-social.c index 98b1d4b59..1746a82ca 100644 --- a/src/social/gnunet-service-social.c +++ b/src/social/gnunet-service-social.c | |||
@@ -421,8 +421,10 @@ psyc_transmit_queue_message (struct Place *plc, | |||
421 | struct MessageTransmitQueue *tmit_msg); | 421 | struct MessageTransmitQueue *tmit_msg); |
422 | 422 | ||
423 | 423 | ||
424 | int | 424 | static int |
425 | place_entry_cleanup (void *cls, const struct GNUNET_HashCode *key, void *value) | 425 | place_entry_cleanup (void *cls, |
426 | const struct GNUNET_HashCode *key, | ||
427 | void *value) | ||
426 | { | 428 | { |
427 | cleanup_place (value); | 429 | cleanup_place (value); |
428 | return GNUNET_YES; | 430 | return GNUNET_YES; |
@@ -433,10 +435,9 @@ place_entry_cleanup (void *cls, const struct GNUNET_HashCode *key, void *value) | |||
433 | * Task run during shutdown. | 435 | * Task run during shutdown. |
434 | * | 436 | * |
435 | * @param cls unused | 437 | * @param cls unused |
436 | * @param tc unused | ||
437 | */ | 438 | */ |
438 | static void | 439 | static void |
439 | shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 440 | shutdown_task (void *cls) |
440 | { | 441 | { |
441 | GNUNET_CONTAINER_multihashmap_iterate (hosts, place_entry_cleanup, NULL); | 442 | GNUNET_CONTAINER_multihashmap_iterate (hosts, place_entry_cleanup, NULL); |
442 | GNUNET_CONTAINER_multihashmap_iterate (guests, place_entry_cleanup, NULL); | 443 | GNUNET_CONTAINER_multihashmap_iterate (guests, place_entry_cleanup, NULL); |
@@ -541,7 +542,7 @@ cleanup_place (struct Place *plc) | |||
541 | 542 | ||
542 | 543 | ||
543 | static void | 544 | static void |
544 | schedule_cleanup_place (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 545 | schedule_cleanup_place (void *cls) |
545 | { | 546 | { |
546 | cleanup_place (cls); | 547 | cleanup_place (cls); |
547 | } | 548 | } |
diff --git a/src/social/test_social.c b/src/social/test_social.c index 1d2673a11..5eeb20196 100644 --- a/src/social/test_social.c +++ b/src/social/test_social.c | |||
@@ -149,7 +149,8 @@ enum | |||
149 | 149 | ||
150 | 150 | ||
151 | static void | 151 | static void |
152 | schedule_guest_leave (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc); | 152 | schedule_guest_leave (void *cls); |
153 | |||
153 | 154 | ||
154 | static void | 155 | static void |
155 | host_answer_door (void *cls, | 156 | host_answer_door (void *cls, |
@@ -229,10 +230,9 @@ cleanup () | |||
229 | * Terminate the test case (failure). | 230 | * Terminate the test case (failure). |
230 | * | 231 | * |
231 | * @param cls NULL | 232 | * @param cls NULL |
232 | * @param tc scheduler context | ||
233 | */ | 233 | */ |
234 | static void | 234 | static void |
235 | end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 235 | end_badly (void *cls) |
236 | { | 236 | { |
237 | res = 1; | 237 | res = 1; |
238 | cleanup (); | 238 | cleanup (); |
@@ -244,10 +244,9 @@ end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
244 | * Terminate the test case (success). | 244 | * Terminate the test case (success). |
245 | * | 245 | * |
246 | * @param cls NULL | 246 | * @param cls NULL |
247 | * @param tc scheduler context | ||
248 | */ | 247 | */ |
249 | static void | 248 | static void |
250 | end_normally (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 249 | end_normally (void *cls) |
251 | { | 250 | { |
252 | res = 0; | 251 | res = 0; |
253 | cleanup (); | 252 | cleanup (); |
@@ -274,7 +273,7 @@ end () | |||
274 | 273 | ||
275 | 274 | ||
276 | static void | 275 | static void |
277 | transmit_resume (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 276 | transmit_resume (void *cls) |
278 | { | 277 | { |
279 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Transmission resumed.\n"); | 278 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Transmission resumed.\n"); |
280 | struct TransmitClosure *tmit = cls; | 279 | struct TransmitClosure *tmit = cls; |
@@ -342,7 +341,7 @@ host_left () | |||
342 | 341 | ||
343 | 342 | ||
344 | static void | 343 | static void |
345 | schedule_host_leave (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 344 | schedule_host_leave (void *cls) |
346 | { | 345 | { |
347 | test = TEST_HOST_LEAVE; | 346 | test = TEST_HOST_LEAVE; |
348 | GNUNET_SOCIAL_host_leave (hst, NULL, &host_left, NULL); | 347 | GNUNET_SOCIAL_host_leave (hst, NULL, &host_left, NULL); |
@@ -478,7 +477,7 @@ app_recv_ego (void *cls, | |||
478 | 477 | ||
479 | 478 | ||
480 | static void | 479 | static void |
481 | schedule_reconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 480 | schedule_reconnect (void *cls) |
482 | { | 481 | { |
483 | test = TEST_RECONNECT; | 482 | test = TEST_RECONNECT; |
484 | 483 | ||
@@ -577,7 +576,7 @@ guest_leave() | |||
577 | 576 | ||
578 | 577 | ||
579 | static void | 578 | static void |
580 | schedule_guest_leave (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 579 | schedule_guest_leave (void *cls) |
581 | { | 580 | { |
582 | guest_leave (); | 581 | guest_leave (); |
583 | } | 582 | } |