diff options
Diffstat (limited to 'src/cadet/test_cadet_single.c')
-rw-r--r-- | src/cadet/test_cadet_single.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/cadet/test_cadet_single.c b/src/cadet/test_cadet_single.c index 3780c745c..29f2bf76f 100644 --- a/src/cadet/test_cadet_single.c +++ b/src/cadet/test_cadet_single.c | |||
@@ -43,9 +43,9 @@ static struct GNUNET_CADET_Channel *ch2; | |||
43 | 43 | ||
44 | static int result; | 44 | static int result; |
45 | 45 | ||
46 | static GNUNET_SCHEDULER_TaskIdentifier abort_task; | 46 | static struct GNUNET_SCHEDULER_Task * abort_task; |
47 | 47 | ||
48 | static GNUNET_SCHEDULER_TaskIdentifier shutdown_task; | 48 | static struct GNUNET_SCHEDULER_Task * shutdown_task; |
49 | 49 | ||
50 | static unsigned int repetition; | 50 | static unsigned int repetition; |
51 | 51 | ||
@@ -62,7 +62,7 @@ static void | |||
62 | do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 62 | do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
63 | { | 63 | { |
64 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "shutdown\n"); | 64 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "shutdown\n"); |
65 | if (GNUNET_SCHEDULER_NO_TASK != abort_task) | 65 | if (NULL != abort_task) |
66 | { | 66 | { |
67 | GNUNET_SCHEDULER_cancel (abort_task); | 67 | GNUNET_SCHEDULER_cancel (abort_task); |
68 | } | 68 | } |
@@ -92,11 +92,11 @@ do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
92 | { | 92 | { |
93 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ABORT\n"); | 93 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ABORT\n"); |
94 | result = GNUNET_SYSERR; | 94 | result = GNUNET_SYSERR; |
95 | abort_task = GNUNET_SCHEDULER_NO_TASK; | 95 | abort_task = NULL; |
96 | if (GNUNET_SCHEDULER_NO_TASK != shutdown_task) | 96 | if (NULL != shutdown_task) |
97 | { | 97 | { |
98 | GNUNET_SCHEDULER_cancel (shutdown_task); | 98 | GNUNET_SCHEDULER_cancel (shutdown_task); |
99 | shutdown_task = GNUNET_SCHEDULER_NO_TASK; | 99 | shutdown_task = NULL; |
100 | } | 100 | } |
101 | do_shutdown (cls, tc); | 101 | do_shutdown (cls, tc); |
102 | } | 102 | } |
@@ -105,7 +105,7 @@ do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
105 | static void | 105 | static void |
106 | finish (void) | 106 | finish (void) |
107 | { | 107 | { |
108 | if (GNUNET_SCHEDULER_NO_TASK != shutdown_task) | 108 | if (NULL != shutdown_task) |
109 | GNUNET_SCHEDULER_cancel (shutdown_task); | 109 | GNUNET_SCHEDULER_cancel (shutdown_task); |
110 | shutdown_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, | 110 | shutdown_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, |
111 | &do_shutdown, NULL); | 111 | &do_shutdown, NULL); |