aboutsummaryrefslogtreecommitdiff
path: root/src/core/test_core_api.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/test_core_api.c')
-rw-r--r--src/core/test_core_api.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/core/test_core_api.c b/src/core/test_core_api.c
index c570def84..cc7c93176 100644
--- a/src/core/test_core_api.c
+++ b/src/core/test_core_api.c
@@ -48,9 +48,9 @@ static struct PeerContext p1;
48 48
49static struct PeerContext p2; 49static struct PeerContext p2;
50 50
51static GNUNET_SCHEDULER_TaskIdentifier err_task; 51static struct GNUNET_SCHEDULER_Task * err_task;
52 52
53static GNUNET_SCHEDULER_TaskIdentifier con_task; 53static struct GNUNET_SCHEDULER_Task * con_task;
54 54
55static int ok; 55static int ok;
56 56
@@ -88,10 +88,10 @@ terminate_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
88 p1.th = NULL; 88 p1.th = NULL;
89 GNUNET_TRANSPORT_disconnect (p2.th); 89 GNUNET_TRANSPORT_disconnect (p2.th);
90 p2.th = NULL; 90 p2.th = NULL;
91 if (GNUNET_SCHEDULER_NO_TASK != con_task) 91 if (NULL != con_task)
92 { 92 {
93 GNUNET_SCHEDULER_cancel (con_task); 93 GNUNET_SCHEDULER_cancel (con_task);
94 con_task = GNUNET_SCHEDULER_NO_TASK; 94 con_task = NULL;
95 } 95 }
96 ok = 0; 96 ok = 0;
97} 97}
@@ -125,10 +125,10 @@ terminate_task_error (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
125 GNUNET_TRANSPORT_disconnect (p2.th); 125 GNUNET_TRANSPORT_disconnect (p2.th);
126 p2.th = NULL; 126 p2.th = NULL;
127 } 127 }
128 if (GNUNET_SCHEDULER_NO_TASK != con_task) 128 if (NULL != con_task)
129 { 129 {
130 GNUNET_SCHEDULER_cancel (con_task); 130 GNUNET_SCHEDULER_cancel (con_task);
131 con_task = GNUNET_SCHEDULER_NO_TASK; 131 con_task = NULL;
132 } 132 }
133 ok = 42; 133 ok = 42;
134} 134}
@@ -162,10 +162,10 @@ connect_notify (void *cls, const struct GNUNET_PeerIdentity *peer)
162 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 162 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
163 "Encrypted connection established to peer `%4s'\n", 163 "Encrypted connection established to peer `%4s'\n",
164 GNUNET_i2s (peer)); 164 GNUNET_i2s (peer));
165 if (GNUNET_SCHEDULER_NO_TASK != con_task) 165 if (NULL != con_task)
166 { 166 {
167 GNUNET_SCHEDULER_cancel (con_task); 167 GNUNET_SCHEDULER_cancel (con_task);
168 con_task = GNUNET_SCHEDULER_NO_TASK; 168 con_task = NULL;
169 } 169 }
170 pc->connect_status = 1; 170 pc->connect_status = 1;
171 if (pc == &p1) 171 if (pc == &p1)
@@ -250,7 +250,7 @@ connect_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
250{ 250{
251 if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN)) 251 if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
252 { 252 {
253 con_task = GNUNET_SCHEDULER_NO_TASK; 253 con_task = NULL;
254 return; 254 return;
255 } 255 }
256 con_task = 256 con_task =