diff options
Diffstat (limited to 'src/fs/gnunet-service-fs_stream.c')
-rw-r--r-- | src/fs/gnunet-service-fs_stream.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/fs/gnunet-service-fs_stream.c b/src/fs/gnunet-service-fs_stream.c index 84fdf463d..3838b1c24 100644 --- a/src/fs/gnunet-service-fs_stream.c +++ b/src/fs/gnunet-service-fs_stream.c | |||
@@ -89,12 +89,12 @@ struct StreamClient | |||
89 | /** | 89 | /** |
90 | * Handle for active read operation, or NULL. | 90 | * Handle for active read operation, or NULL. |
91 | */ | 91 | */ |
92 | struct GNUNET_STREAM_IOReadHandle *rh; | 92 | struct GNUNET_STREAM_ReadHandle *rh; |
93 | 93 | ||
94 | /** | 94 | /** |
95 | * Handle for active write operation, or NULL. | 95 | * Handle for active write operation, or NULL. |
96 | */ | 96 | */ |
97 | struct GNUNET_STREAM_IOWriteHandle *wh; | 97 | struct GNUNET_STREAM_WriteHandle *wh; |
98 | 98 | ||
99 | /** | 99 | /** |
100 | * Head of write queue. | 100 | * Head of write queue. |
@@ -268,12 +268,12 @@ struct StreamHandle | |||
268 | /** | 268 | /** |
269 | * Handle for active read operation, or NULL. | 269 | * Handle for active read operation, or NULL. |
270 | */ | 270 | */ |
271 | struct GNUNET_STREAM_IOReadHandle *rh; | 271 | struct GNUNET_STREAM_ReadHandle *rh; |
272 | 272 | ||
273 | /** | 273 | /** |
274 | * Handle for active write operation, or NULL. | 274 | * Handle for active write operation, or NULL. |
275 | */ | 275 | */ |
276 | struct GNUNET_STREAM_IOWriteHandle *wh; | 276 | struct GNUNET_STREAM_WriteHandle *wh; |
277 | 277 | ||
278 | /** | 278 | /** |
279 | * Tokenizer for replies. | 279 | * Tokenizer for replies. |
@@ -387,9 +387,9 @@ destroy_stream_handle (struct StreamHandle *sh) | |||
387 | &free_waiting_entry, | 387 | &free_waiting_entry, |
388 | sh); | 388 | sh); |
389 | if (NULL != sh->wh) | 389 | if (NULL != sh->wh) |
390 | GNUNET_STREAM_io_write_cancel (sh->wh); | 390 | GNUNET_STREAM_write_cancel (sh->wh); |
391 | if (NULL != sh->rh) | 391 | if (NULL != sh->rh) |
392 | GNUNET_STREAM_io_read_cancel (sh->rh); | 392 | GNUNET_STREAM_read_cancel (sh->rh); |
393 | if (GNUNET_SCHEDULER_NO_TASK != sh->timeout_task) | 393 | if (GNUNET_SCHEDULER_NO_TASK != sh->timeout_task) |
394 | GNUNET_SCHEDULER_cancel (sh->timeout_task); | 394 | GNUNET_SCHEDULER_cancel (sh->timeout_task); |
395 | if (GNUNET_SCHEDULER_NO_TASK != sh->reset_task) | 395 | if (GNUNET_SCHEDULER_NO_TASK != sh->reset_task) |
@@ -472,7 +472,7 @@ reset_stream (struct StreamHandle *sh) | |||
472 | GNUNET_i2s (&sh->target)); | 472 | GNUNET_i2s (&sh->target)); |
473 | if (NULL != sh->rh) | 473 | if (NULL != sh->rh) |
474 | { | 474 | { |
475 | GNUNET_STREAM_io_read_cancel (sh->rh); | 475 | GNUNET_STREAM_read_cancel (sh->rh); |
476 | sh->rh = NULL; | 476 | sh->rh = NULL; |
477 | } | 477 | } |
478 | GNUNET_STREAM_close (sh->stream); | 478 | GNUNET_STREAM_close (sh->stream); |
@@ -934,9 +934,9 @@ terminate_stream (struct StreamClient *sc) | |||
934 | if (GNUNET_SCHEDULER_NO_TASK != sc->timeout_task) | 934 | if (GNUNET_SCHEDULER_NO_TASK != sc->timeout_task) |
935 | GNUNET_SCHEDULER_cancel (sc->timeout_task); | 935 | GNUNET_SCHEDULER_cancel (sc->timeout_task); |
936 | if (NULL != sc->rh) | 936 | if (NULL != sc->rh) |
937 | GNUNET_STREAM_io_read_cancel (sc->rh); | 937 | GNUNET_STREAM_read_cancel (sc->rh); |
938 | if (NULL != sc->wh) | 938 | if (NULL != sc->wh) |
939 | GNUNET_STREAM_io_write_cancel (sc->wh); | 939 | GNUNET_STREAM_write_cancel (sc->wh); |
940 | if (NULL != sc->qe) | 940 | if (NULL != sc->qe) |
941 | GNUNET_DATASTORE_cancel (sc->qe); | 941 | GNUNET_DATASTORE_cancel (sc->qe); |
942 | GNUNET_SERVER_mst_destroy (sc->mst); | 942 | GNUNET_SERVER_mst_destroy (sc->mst); |