[GNUnet-SVN] r34249 - in gnunet/src: cadet fs include

[gnunet]

Author: bartpolot
Date: 2014-08-31 19:58:59 +0200 (Sun, 31 Aug 2014)
New Revision: 34249

Modified:
   gnunet/src/cadet/cadet_api.c
   gnunet/src/fs/gnunet-service-fs_cadet_client.c
   gnunet/src/include/gnunet_cadet_service.h
Log:
- remove duplicate/incorrect API call

Modified: gnunet/src/cadet/cadet_api.c
===================================================================
--- gnunet/src/cadet/cadet_api.c        2014-08-31 15:14:56 UTC (rev 34248)
+++ gnunet/src/cadet/cadet_api.c        2014-08-31 17:58:59 UTC (rev 34249)
@@ -1758,13 +1758,6 @@
 
 
 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)
 {
   struct GNUNET_CADET_Handle *cadet;

Modified: gnunet/src/fs/gnunet-service-fs_cadet_client.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs_cadet_client.c      2014-08-31 15:14:56 UTC 
(rev 34248)
+++ gnunet/src/fs/gnunet-service-fs_cadet_client.c      2014-08-31 17:58:59 UTC 
(rev 34249)
@@ -223,11 +223,11 @@
   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,

Modified: gnunet/src/include/gnunet_cadet_service.h
===================================================================
--- gnunet/src/include/gnunet_cadet_service.h   2014-08-31 15:14:56 UTC (rev 
34248)
+++ gnunet/src/include/gnunet_cadet_service.h   2014-08-31 17:58:59 UTC (rev 
34249)
@@ -348,19 +348,7 @@
 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.
  *