diff options
author | Sree Harsha Totakura <totakura@in.tum.de> | 2012-09-30 14:23:43 +0000 |
---|---|---|
committer | Sree Harsha Totakura <totakura@in.tum.de> | 2012-09-30 14:23:43 +0000 |
commit | a58166f25e49799aa9a4a5447f857f59e6a3a828 (patch) | |
tree | 1903be0fbd3b6e8c5f83d47f55e605cbacefc564 | |
parent | be0b41ff6eaa768b489440db2be15a1bb1489d43 (diff) | |
download | gnunet-a58166f25e49799aa9a4a5447f857f59e6a3a828.tar.gz gnunet-a58166f25e49799aa9a4a5447f857f59e6a3a828.zip |
removing duplicate specifiers
-rw-r--r-- | src/testbed/test_gnunet_helper_testbed.c | 4 | ||||
-rw-r--r-- | src/testbed/test_testbed_api.c | 4 | ||||
-rw-r--r-- | src/testbed/test_testbed_api_2peers_1controller.c | 4 | ||||
-rw-r--r-- | src/testbed/test_testbed_api_controllerlink.c | 2 | ||||
-rw-r--r-- | src/testbed/test_testbed_api_test.c | 2 | ||||
-rw-r--r-- | src/testbed/test_testbed_api_testbed_run.c | 2 | ||||
-rw-r--r-- | src/testbed/test_testbed_api_topology.c | 2 |
7 files changed, 10 insertions, 10 deletions
diff --git a/src/testbed/test_gnunet_helper_testbed.c b/src/testbed/test_gnunet_helper_testbed.c index 87e39847a..7fce9a5d8 100644 --- a/src/testbed/test_gnunet_helper_testbed.c +++ b/src/testbed/test_gnunet_helper_testbed.c | |||
@@ -83,7 +83,7 @@ static int result; | |||
83 | * @param tc the task context | 83 | * @param tc the task context |
84 | */ | 84 | */ |
85 | static void | 85 | static void |
86 | do_shutdown (void *cls, const const struct GNUNET_SCHEDULER_TaskContext *tc) | 86 | do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
87 | { | 87 | { |
88 | if (GNUNET_SCHEDULER_NO_TASK != abort_task) | 88 | if (GNUNET_SCHEDULER_NO_TASK != abort_task) |
89 | GNUNET_SCHEDULER_cancel (abort_task); | 89 | GNUNET_SCHEDULER_cancel (abort_task); |
@@ -101,7 +101,7 @@ do_shutdown (void *cls, const const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
101 | * @param tc the task context | 101 | * @param tc the task context |
102 | */ | 102 | */ |
103 | static void | 103 | static void |
104 | do_abort (void *cls, const const struct GNUNET_SCHEDULER_TaskContext *tc) | 104 | do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
105 | { | 105 | { |
106 | abort_task = GNUNET_SCHEDULER_NO_TASK; | 106 | abort_task = GNUNET_SCHEDULER_NO_TASK; |
107 | LOG (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n"); | 107 | LOG (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n"); |
diff --git a/src/testbed/test_testbed_api.c b/src/testbed/test_testbed_api.c index 5deaf97ae..0fb745a1c 100644 --- a/src/testbed/test_testbed_api.c +++ b/src/testbed/test_testbed_api.c | |||
@@ -136,7 +136,7 @@ static enum Test sub_test; | |||
136 | * @param tc the task context | 136 | * @param tc the task context |
137 | */ | 137 | */ |
138 | static void | 138 | static void |
139 | do_shutdown (void *cls, const const struct GNUNET_SCHEDULER_TaskContext *tc) | 139 | do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
140 | { | 140 | { |
141 | LOG (GNUNET_ERROR_TYPE_DEBUG, "Shutting down...\n"); | 141 | LOG (GNUNET_ERROR_TYPE_DEBUG, "Shutting down...\n"); |
142 | if (GNUNET_SCHEDULER_NO_TASK != abort_task) | 142 | if (GNUNET_SCHEDULER_NO_TASK != abort_task) |
@@ -159,7 +159,7 @@ do_shutdown (void *cls, const const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
159 | * @param tc the task context | 159 | * @param tc the task context |
160 | */ | 160 | */ |
161 | static void | 161 | static void |
162 | do_abort (void *cls, const const struct GNUNET_SCHEDULER_TaskContext *tc) | 162 | do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
163 | { | 163 | { |
164 | LOG (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n"); | 164 | LOG (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n"); |
165 | abort_task = GNUNET_SCHEDULER_NO_TASK; | 165 | abort_task = GNUNET_SCHEDULER_NO_TASK; |
diff --git a/src/testbed/test_testbed_api_2peers_1controller.c b/src/testbed/test_testbed_api_2peers_1controller.c index 0e1f83e98..f680efb9e 100644 --- a/src/testbed/test_testbed_api_2peers_1controller.c +++ b/src/testbed/test_testbed_api_2peers_1controller.c | |||
@@ -198,7 +198,7 @@ do_shutdown (void *cls, const const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
198 | * @param tc the task context | 198 | * @param tc the task context |
199 | */ | 199 | */ |
200 | static void | 200 | static void |
201 | do_abort (void *cls, const const struct GNUNET_SCHEDULER_TaskContext *tc) | 201 | do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
202 | { | 202 | { |
203 | LOG (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n"); | 203 | LOG (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n"); |
204 | abort_task = GNUNET_SCHEDULER_NO_TASK; | 204 | abort_task = GNUNET_SCHEDULER_NO_TASK; |
@@ -226,7 +226,7 @@ op_comp_cb (void *cls, struct GNUNET_TESTBED_Operation *op, const char *emsg); | |||
226 | * @param tc the task context | 226 | * @param tc the task context |
227 | */ | 227 | */ |
228 | static void | 228 | static void |
229 | do_delayed_connect (void *cls, const const struct GNUNET_SCHEDULER_TaskContext *tc) | 229 | do_delayed_connect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
230 | { | 230 | { |
231 | delayed_connect_task = GNUNET_SCHEDULER_NO_TASK; | 231 | delayed_connect_task = GNUNET_SCHEDULER_NO_TASK; |
232 | GNUNET_assert (NULL == common_operation); | 232 | GNUNET_assert (NULL == common_operation); |
diff --git a/src/testbed/test_testbed_api_controllerlink.c b/src/testbed/test_testbed_api_controllerlink.c index a82c78248..2bb3f8d27 100644 --- a/src/testbed/test_testbed_api_controllerlink.c +++ b/src/testbed/test_testbed_api_controllerlink.c | |||
@@ -191,7 +191,7 @@ static enum Stage result; | |||
191 | * @param tc the task context | 191 | * @param tc the task context |
192 | */ | 192 | */ |
193 | static void | 193 | static void |
194 | do_shutdown (void *cls, const const struct GNUNET_SCHEDULER_TaskContext *tc) | 194 | do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
195 | { | 195 | { |
196 | if (GNUNET_SCHEDULER_NO_TASK != abort_task) | 196 | if (GNUNET_SCHEDULER_NO_TASK != abort_task) |
197 | GNUNET_SCHEDULER_cancel (abort_task); | 197 | GNUNET_SCHEDULER_cancel (abort_task); |
diff --git a/src/testbed/test_testbed_api_test.c b/src/testbed/test_testbed_api_test.c index f552d1a78..e93c5872a 100644 --- a/src/testbed/test_testbed_api_test.c +++ b/src/testbed/test_testbed_api_test.c | |||
@@ -56,7 +56,7 @@ static int result; | |||
56 | * @param tc the task context | 56 | * @param tc the task context |
57 | */ | 57 | */ |
58 | static void | 58 | static void |
59 | do_shutdown (void *cls, const const struct GNUNET_SCHEDULER_TaskContext *tc) | 59 | do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
60 | { | 60 | { |
61 | GNUNET_SCHEDULER_shutdown (); | 61 | GNUNET_SCHEDULER_shutdown (); |
62 | } | 62 | } |
diff --git a/src/testbed/test_testbed_api_testbed_run.c b/src/testbed/test_testbed_api_testbed_run.c index dcb02dd7d..16fdc1e2f 100644 --- a/src/testbed/test_testbed_api_testbed_run.c +++ b/src/testbed/test_testbed_api_testbed_run.c | |||
@@ -66,7 +66,7 @@ static int result; | |||
66 | * @param tc the task context | 66 | * @param tc the task context |
67 | */ | 67 | */ |
68 | static void | 68 | static void |
69 | do_shutdown (void *cls, const const struct GNUNET_SCHEDULER_TaskContext *tc) | 69 | do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
70 | { | 70 | { |
71 | if (GNUNET_SCHEDULER_NO_TASK != abort_task) | 71 | if (GNUNET_SCHEDULER_NO_TASK != abort_task) |
72 | GNUNET_SCHEDULER_cancel (abort_task); | 72 | GNUNET_SCHEDULER_cancel (abort_task); |
diff --git a/src/testbed/test_testbed_api_topology.c b/src/testbed/test_testbed_api_topology.c index 10be26887..70a972497 100644 --- a/src/testbed/test_testbed_api_topology.c +++ b/src/testbed/test_testbed_api_topology.c | |||
@@ -61,7 +61,7 @@ static unsigned int overlay_connects; | |||
61 | * @param tc the task context | 61 | * @param tc the task context |
62 | */ | 62 | */ |
63 | static void | 63 | static void |
64 | do_shutdown (void *cls, const const struct GNUNET_SCHEDULER_TaskContext *tc) | 64 | do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
65 | { | 65 | { |
66 | if (NULL != op) | 66 | if (NULL != op) |
67 | { | 67 | { |