diff options
Diffstat (limited to 'src/util/test_common_logging_runtime_loglevels.c')
-rw-r--r-- | src/util/test_common_logging_runtime_loglevels.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/util/test_common_logging_runtime_loglevels.c b/src/util/test_common_logging_runtime_loglevels.c index 0fe8614d0..42371f33f 100644 --- a/src/util/test_common_logging_runtime_loglevels.c +++ b/src/util/test_common_logging_runtime_loglevels.c | |||
@@ -49,9 +49,9 @@ static struct GNUNET_OS_Process *proc; | |||
49 | /* Pipe to read from started processes stdout (on read end) */ | 49 | /* Pipe to read from started processes stdout (on read end) */ |
50 | static struct GNUNET_DISK_PipeHandle *pipe_stdout; | 50 | static struct GNUNET_DISK_PipeHandle *pipe_stdout; |
51 | 51 | ||
52 | static GNUNET_SCHEDULER_TaskIdentifier die_task; | 52 | static struct GNUNET_SCHEDULER_Task * die_task; |
53 | 53 | ||
54 | static GNUNET_SCHEDULER_TaskIdentifier read_task; | 54 | static struct GNUNET_SCHEDULER_Task * read_task; |
55 | 55 | ||
56 | static void | 56 | static void |
57 | runone (void); | 57 | runone (void); |
@@ -72,10 +72,10 @@ end_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
72 | GNUNET_OS_process_destroy (proc); | 72 | GNUNET_OS_process_destroy (proc); |
73 | proc = NULL; | 73 | proc = NULL; |
74 | } | 74 | } |
75 | if (GNUNET_SCHEDULER_NO_TASK != read_task) | 75 | if (NULL != read_task) |
76 | { | 76 | { |
77 | GNUNET_SCHEDULER_cancel (read_task); | 77 | GNUNET_SCHEDULER_cancel (read_task); |
78 | read_task = GNUNET_SCHEDULER_NO_TASK; | 78 | read_task = NULL; |
79 | } | 79 | } |
80 | GNUNET_DISK_pipe_close (pipe_stdout); | 80 | GNUNET_DISK_pipe_close (pipe_stdout); |
81 | if (ok == 1) | 81 | if (ok == 1) |
@@ -223,7 +223,7 @@ read_call (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
223 | long delays[8]; | 223 | long delays[8]; |
224 | int rd; | 224 | int rd; |
225 | 225 | ||
226 | read_task = GNUNET_SCHEDULER_NO_TASK; | 226 | read_task = NULL; |
227 | rd = GNUNET_DISK_file_read (stdout_read_handle, buf_ptr, | 227 | rd = GNUNET_DISK_file_read (stdout_read_handle, buf_ptr, |
228 | sizeof (buf) - bytes); | 228 | sizeof (buf) - bytes); |
229 | if (rd > 0) | 229 | if (rd > 0) |