From 6e0e7e09552af05a229cad2686d73e2d2ca18925 Mon Sep 17 00:00:00 2001 From: Bart Polot Date: Sun, 31 Aug 2014 17:58:59 +0000 Subject: - remove duplicate/incorrect API call --- src/cadet/cadet_api.c | 7 ------- src/fs/gnunet-service-fs_cadet_client.c | 10 +++++----- src/include/gnunet_cadet_service.h | 12 ------------ 3 files changed, 5 insertions(+), 24 deletions(-) (limited to 'src') diff --git a/src/cadet/cadet_api.c b/src/cadet/cadet_api.c index 5cb42286e..c65475b10 100644 --- a/src/cadet/cadet_api.c +++ b/src/cadet/cadet_api.c @@ -1757,13 +1757,6 @@ GNUNET_CADET_notify_transmit_ready (struct GNUNET_CADET_Channel *channel, int co } -void -GNUNET_CADET_cancel_notify (struct GNUNET_CADET_TransmitHandle *th) -{ - th->notify = NULL; -} - - void GNUNET_CADET_notify_transmit_ready_cancel (struct GNUNET_CADET_TransmitHandle *th) { diff --git a/src/fs/gnunet-service-fs_cadet_client.c b/src/fs/gnunet-service-fs_cadet_client.c index cfef128fb..f0905e6c3 100644 --- a/src/fs/gnunet-service-fs_cadet_client.c +++ b/src/fs/gnunet-service-fs_cadet_client.c @@ -223,11 +223,11 @@ reset_cadet (struct CadetHandle *mh) if (NULL != channel) { /* Avoid loop */ - if ( NULL != mh->wh) - { - GNUNET_CADET_cancel_notify(mh->wh); - mh->wh = NULL; - } + if (NULL != mh->wh) + { + GNUNET_CADET_notify_transmit_ready_cancel (mh->wh); + mh->wh = NULL; + } GNUNET_CADET_channel_destroy (channel); } GNUNET_CONTAINER_multihashmap_iterate (mh->waiting_map, diff --git a/src/include/gnunet_cadet_service.h b/src/include/gnunet_cadet_service.h index a4ac42eb8..14826c40b 100644 --- a/src/include/gnunet_cadet_service.h +++ b/src/include/gnunet_cadet_service.h @@ -348,18 +348,6 @@ void GNUNET_CADET_notify_transmit_ready_cancel (struct GNUNET_CADET_TransmitHandle *th); - -/** - * Cancel only the notify without cleaning the structs to a futher call to channel destroy - * - * @param th handle that was returned by "notify_transmit_ready". - */ -void -GNUNET_CADET_cancel_notify (struct GNUNET_CADET_TransmitHandle - *th); - - - /** * Indicate readiness to receive the next message on a channel. -- cgit v1.2.3