diff options
Diffstat (limited to 'src/pt')
-rw-r--r-- | src/pt/gnunet-daemon-pt.c | 8 | ||||
-rw-r--r-- | src/pt/test_gns_vpn.c | 13 | ||||
-rw-r--r-- | src/pt/test_gnunet_vpn.c | 7 |
3 files changed, 10 insertions, 18 deletions
diff --git a/src/pt/gnunet-daemon-pt.c b/src/pt/gnunet-daemon-pt.c index c377c3f90..a86cbd316 100644 --- a/src/pt/gnunet-daemon-pt.c +++ b/src/pt/gnunet-daemon-pt.c | |||
@@ -800,11 +800,9 @@ transmit_dns_request_to_cadet (void *cls, | |||
800 | * Task run if the time to answer a DNS request via CADET is over. | 800 | * Task run if the time to answer a DNS request via CADET is over. |
801 | * | 801 | * |
802 | * @param cls the `struct RequestContext` to abort | 802 | * @param cls the `struct RequestContext` to abort |
803 | * @param tc scheduler context | ||
804 | */ | 803 | */ |
805 | static void | 804 | static void |
806 | timeout_request (void *cls, | 805 | timeout_request (void *cls) |
807 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
808 | { | 806 | { |
809 | struct RequestContext *rc = cls; | 807 | struct RequestContext *rc = cls; |
810 | struct CadetExit *exit = rc->exit; | 808 | struct CadetExit *exit = rc->exit; |
@@ -1023,11 +1021,9 @@ abort_all_requests (struct CadetExit *exit) | |||
1023 | * Function scheduled as very last function, cleans up after us | 1021 | * Function scheduled as very last function, cleans up after us |
1024 | * | 1022 | * |
1025 | * @param cls closure, NULL | 1023 | * @param cls closure, NULL |
1026 | * @param tskctx scheduler context, unused | ||
1027 | */ | 1024 | */ |
1028 | static void | 1025 | static void |
1029 | cleanup (void *cls, | 1026 | cleanup (void *cls) |
1030 | const struct GNUNET_SCHEDULER_TaskContext *tskctx) | ||
1031 | { | 1027 | { |
1032 | struct CadetExit *exit; | 1028 | struct CadetExit *exit; |
1033 | 1029 | ||
diff --git a/src/pt/test_gns_vpn.c b/src/pt/test_gns_vpn.c index f1ddcddc2..c0d50d177 100644 --- a/src/pt/test_gns_vpn.c +++ b/src/pt/test_gns_vpn.c | |||
@@ -140,8 +140,7 @@ mhd_ahc (void *cls, | |||
140 | 140 | ||
141 | 141 | ||
142 | static void | 142 | static void |
143 | do_shutdown (void *cls, | 143 | do_shutdown (void *cls) |
144 | const struct GNUNET_SCHEDULER_TaskContext *c) | ||
145 | { | 144 | { |
146 | if (mhd_task_id != NULL) | 145 | if (mhd_task_id != NULL) |
147 | { | 146 | { |
@@ -181,8 +180,7 @@ curl_main (void); | |||
181 | 180 | ||
182 | 181 | ||
183 | static void | 182 | static void |
184 | curl_task (void *cls, | 183 | curl_task (void *cls) |
185 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
186 | { | 184 | { |
187 | curl_task_id = NULL; | 185 | curl_task_id = NULL; |
188 | curl_main (); | 186 | curl_main (); |
@@ -264,7 +262,7 @@ curl_main () | |||
264 | 262 | ||
265 | 263 | ||
266 | static void | 264 | static void |
267 | start_curl (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 265 | start_curl (void *cls) |
268 | { | 266 | { |
269 | GNUNET_asprintf (&url, | 267 | GNUNET_asprintf (&url, |
270 | "http://%s/hello_world", | 268 | "http://%s/hello_world", |
@@ -289,7 +287,7 @@ start_curl (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
289 | 287 | ||
290 | 288 | ||
291 | static void | 289 | static void |
292 | disco_ns (void* cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 290 | disco_ns (void* cls) |
293 | { | 291 | { |
294 | GNUNET_NAMESTORE_disconnect (namestore); | 292 | GNUNET_NAMESTORE_disconnect (namestore); |
295 | namestore = NULL; | 293 | namestore = NULL; |
@@ -340,8 +338,7 @@ mhd_main (void); | |||
340 | 338 | ||
341 | 339 | ||
342 | static void | 340 | static void |
343 | mhd_task (void *cls, | 341 | mhd_task (void *cls) |
344 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
345 | { | 342 | { |
346 | mhd_task_id = NULL; | 343 | mhd_task_id = NULL; |
347 | MHD_run (mhd); | 344 | MHD_run (mhd); |
diff --git a/src/pt/test_gnunet_vpn.c b/src/pt/test_gnunet_vpn.c index b5bc1395b..85b28fbf8 100644 --- a/src/pt/test_gnunet_vpn.c +++ b/src/pt/test_gnunet_vpn.c | |||
@@ -171,8 +171,7 @@ do_shutdown () | |||
171 | * Function to run the HTTP client. | 171 | * Function to run the HTTP client. |
172 | */ | 172 | */ |
173 | static void | 173 | static void |
174 | curl_main (void *cls, | 174 | curl_main (void *cls) |
175 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
176 | { | 175 | { |
177 | fd_set rs; | 176 | fd_set rs; |
178 | fd_set ws; | 177 | fd_set ws; |
@@ -304,7 +303,7 @@ mhd_main (void); | |||
304 | 303 | ||
305 | 304 | ||
306 | static void | 305 | static void |
307 | mhd_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 306 | mhd_task (void *cls) |
308 | { | 307 | { |
309 | mhd_task_id = NULL; | 308 | mhd_task_id = NULL; |
310 | MHD_run (mhd); | 309 | MHD_run (mhd); |
@@ -313,7 +312,7 @@ mhd_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
313 | 312 | ||
314 | 313 | ||
315 | static void | 314 | static void |
316 | ctrl_c_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 315 | ctrl_c_shutdown (void *cls) |
317 | { | 316 | { |
318 | ctrl_c_task_id = NULL; | 317 | ctrl_c_task_id = NULL; |
319 | do_shutdown (); | 318 | do_shutdown (); |