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/namecache | |
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/namecache')
-rw-r--r-- | src/namecache/gnunet-namecache.c | 4 | ||||
-rw-r--r-- | src/namecache/gnunet-service-namecache.c | 4 | ||||
-rw-r--r-- | src/namecache/namecache_api.c | 4 | ||||
-rw-r--r-- | src/namecache/test_namecache_api_cache_block.c | 5 |
4 files changed, 5 insertions, 12 deletions
diff --git a/src/namecache/gnunet-namecache.c b/src/namecache/gnunet-namecache.c index eed40da22..6abcb7b92 100644 --- a/src/namecache/gnunet-namecache.c +++ b/src/namecache/gnunet-namecache.c | |||
@@ -68,11 +68,9 @@ static int ret; | |||
68 | * Task run on shutdown. Cleans up everything. | 68 | * Task run on shutdown. Cleans up everything. |
69 | * | 69 | * |
70 | * @param cls unused | 70 | * @param cls unused |
71 | * @param tc scheduler context | ||
72 | */ | 71 | */ |
73 | static void | 72 | static void |
74 | do_shutdown (void *cls, | 73 | do_shutdown (void *cls) |
75 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
76 | { | 74 | { |
77 | if (NULL != qe) | 75 | if (NULL != qe) |
78 | { | 76 | { |
diff --git a/src/namecache/gnunet-service-namecache.c b/src/namecache/gnunet-service-namecache.c index 3eedb18a5..81b1cce9b 100644 --- a/src/namecache/gnunet-service-namecache.c +++ b/src/namecache/gnunet-service-namecache.c | |||
@@ -105,10 +105,9 @@ static struct GNUNET_SERVER_NotificationContext *monitor_nc; | |||
105 | * Task run during shutdown. | 105 | * Task run during shutdown. |
106 | * | 106 | * |
107 | * @param cls unused | 107 | * @param cls unused |
108 | * @param tc unused | ||
109 | */ | 108 | */ |
110 | static void | 109 | static void |
111 | cleanup_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 110 | cleanup_task (void *cls) |
112 | { | 111 | { |
113 | struct NamecacheClient *nc; | 112 | struct NamecacheClient *nc; |
114 | 113 | ||
@@ -426,4 +425,3 @@ main (int argc, char *const *argv) | |||
426 | } | 425 | } |
427 | 426 | ||
428 | /* end of gnunet-service-namecache.c */ | 427 | /* end of gnunet-service-namecache.c */ |
429 | |||
diff --git a/src/namecache/namecache_api.c b/src/namecache/namecache_api.c index 7f9baf1b4..15a750448 100644 --- a/src/namecache/namecache_api.c +++ b/src/namecache/namecache_api.c | |||
@@ -495,11 +495,9 @@ reconnect (struct GNUNET_NAMECACHE_Handle *h) | |||
495 | * Re-establish the connection to the service. | 495 | * Re-establish the connection to the service. |
496 | * | 496 | * |
497 | * @param cls handle to use to re-connect. | 497 | * @param cls handle to use to re-connect. |
498 | * @param tc scheduler context | ||
499 | */ | 498 | */ |
500 | static void | 499 | static void |
501 | reconnect_task (void *cls, | 500 | reconnect_task (void *cls) |
502 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
503 | { | 501 | { |
504 | struct GNUNET_NAMECACHE_Handle *h = cls; | 502 | struct GNUNET_NAMECACHE_Handle *h = cls; |
505 | 503 | ||
diff --git a/src/namecache/test_namecache_api_cache_block.c b/src/namecache/test_namecache_api_cache_block.c index ff4d93b4f..5522b207d 100644 --- a/src/namecache/test_namecache_api_cache_block.c +++ b/src/namecache/test_namecache_api_cache_block.c | |||
@@ -68,10 +68,9 @@ cleanup () | |||
68 | * Re-establish the connection to the service. | 68 | * Re-establish the connection to the service. |
69 | * | 69 | * |
70 | * @param cls handle to use to re-connect. | 70 | * @param cls handle to use to re-connect. |
71 | * @param tc scheduler context | ||
72 | */ | 71 | */ |
73 | static void | 72 | static void |
74 | endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 73 | endbadly (void *cls) |
75 | { | 74 | { |
76 | if (NULL != nsqe) | 75 | if (NULL != nsqe) |
77 | { | 76 | { |
@@ -84,7 +83,7 @@ endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
84 | 83 | ||
85 | 84 | ||
86 | static void | 85 | static void |
87 | end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 86 | end (void *cls) |
88 | { | 87 | { |
89 | cleanup (); | 88 | cleanup (); |
90 | res = 0; | 89 | res = 0; |