5 files changed, 13 insertions, 14 deletions

diff --git a/src/fs/fs_download.c b/src/fs/fs_download.c
index 8ae4a29fb..e93db4cfd 100644
--- a/src/fs/fs_download.c
+++ b/src/fs/fs_download.c
@@ -1166,7 +1166,7 @@ signal_error:
     GNUNET_CLIENT_notify_transmit_ready_cancel (dc->th);
     dc->th = NULL;
   }
-  GNUNET_CLIENT_disconnect (dc->client, GNUNET_NO);
+  GNUNET_CLIENT_disconnect (dc->client);
   dc->in_receive = GNUNET_NO;
   dc->client = NULL;
   GNUNET_FS_free_download_request_ (dc->top_request);
@@ -1404,7 +1404,7 @@ try_reconnect (struct GNUNET_FS_DownloadContext *dc)
     dc->pending_head = NULL;
     dc->pending_tail = NULL;
     GNUNET_CONTAINER_multihashmap_iterate (dc->active, &retry_entry, dc);
-    GNUNET_CLIENT_disconnect (dc->client, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (dc->client);
     dc->in_receive = GNUNET_NO;
     dc->client = NULL;
   }
@@ -1471,7 +1471,7 @@ deactivate_fs_download (void *cls)
   }
   if (NULL != dc->client)
   {
-    GNUNET_CLIENT_disconnect (dc->client, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (dc->client);
     dc->in_receive = GNUNET_NO;
     dc->client = NULL;
   }
diff --git a/src/fs/fs_list_indexed.c b/src/fs/fs_list_indexed.c
index 784c9881a..ef03dee76 100644
--- a/src/fs/fs_list_indexed.c
+++ b/src/fs/fs_list_indexed.c
@@ -176,7 +176,7 @@ GNUNET_FS_get_indexed_files (struct GNUNET_FS_Handle *h,
 void
 GNUNET_FS_get_indexed_files_cancel (struct GNUNET_FS_GetIndexedContext *gic)
 {
-  GNUNET_CLIENT_disconnect (gic->client, GNUNET_NO);
+  GNUNET_CLIENT_disconnect (gic->client);
   GNUNET_free (gic);
 }
 
diff --git a/src/fs/fs_publish.c b/src/fs/fs_publish.c
index e0a6f046a..3d83beef8 100644
--- a/src/fs/fs_publish.c
+++ b/src/fs/fs_publish.c
@@ -98,7 +98,7 @@ publish_cleanup (struct GNUNET_FS_PublishContext *pc)
   }
   if (pc->client != NULL)
   {
-    GNUNET_CLIENT_disconnect (pc->client, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (pc->client);
     pc->client = NULL;
   }
   GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == pc->upload_task);
@@ -611,7 +611,7 @@ process_index_start_response (void *cls, const struct GNUNET_MessageHeader *msg)
   const char *emsg;
   uint16_t msize;
 
-  GNUNET_CLIENT_disconnect (pc->client, GNUNET_NO);
+  GNUNET_CLIENT_disconnect (pc->client);
   pc->client = NULL;
   p = pc->fi_pos;
   if (msg == NULL)
diff --git a/src/fs/fs_search.c b/src/fs/fs_search.c
index 94a77e136..ef3e66fbc 100644
--- a/src/fs/fs_search.c
+++ b/src/fs/fs_search.c
@@ -30,7 +30,6 @@
 #include "gnunet_protocols.h"
 #include "fs_api.h"
 
-#define DEBUG_SEARCH GNUNET_EXTRA_LOGGING
 
 /**
  * Number of availability trials we perform per search result.
@@ -1152,7 +1151,7 @@ try_reconnect (struct GNUNET_FS_SearchContext *sc)
 {
   if (NULL != sc->client)
   {
-    GNUNET_CLIENT_disconnect (sc->client, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (sc->client);
     sc->client = NULL;
   }
   sc->task =
@@ -1369,7 +1368,7 @@ GNUNET_FS_search_signal_suspend_ (void *cls)
   if (sc->task != GNUNET_SCHEDULER_NO_TASK)
     GNUNET_SCHEDULER_cancel (sc->task);
   if (NULL != sc->client)
-    GNUNET_CLIENT_disconnect (sc->client, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (sc->client);
   GNUNET_CONTAINER_multihashmap_destroy (sc->master_result_map);
   if (sc->requests != NULL)
   {
@@ -1425,7 +1424,7 @@ GNUNET_FS_search_pause (struct GNUNET_FS_SearchContext *sc)
     GNUNET_SCHEDULER_cancel (sc->task);
   sc->task = GNUNET_SCHEDULER_NO_TASK;
   if (NULL != sc->client)
-    GNUNET_CLIENT_disconnect (sc->client, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (sc->client);
   sc->client = NULL;
   GNUNET_FS_search_sync_ (sc);
   GNUNET_CONTAINER_multihashmap_iterate (sc->master_result_map,
@@ -1569,7 +1568,7 @@ GNUNET_FS_search_stop (struct GNUNET_FS_SearchContext *sc)
   if (sc->task != GNUNET_SCHEDULER_NO_TASK)
     GNUNET_SCHEDULER_cancel (sc->task);
   if (NULL != sc->client)
-    GNUNET_CLIENT_disconnect (sc->client, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (sc->client);
   GNUNET_CONTAINER_multihashmap_iterate (sc->master_result_map,
                                          &search_result_free, sc);
   GNUNET_CONTAINER_multihashmap_destroy (sc->master_result_map);
diff --git a/src/fs/fs_unindex.c b/src/fs/fs_unindex.c
index bf619b75a..fa71b56bc 100644
--- a/src/fs/fs_unindex.c
+++ b/src/fs/fs_unindex.c
@@ -223,7 +223,7 @@ process_fs_response (void *cls, const struct GNUNET_MessageHeader *msg)
 
   if (uc->client != NULL)
   {
-    GNUNET_CLIENT_disconnect (uc->client, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (uc->client);
     uc->client = NULL;
   }
   if (uc->state != UNINDEX_STATE_FS_NOTIFY)
@@ -708,7 +708,7 @@ GNUNET_FS_unindex_signal_suspend_ (void *cls)
   }
   if (uc->client != NULL)
   {
-    GNUNET_CLIENT_disconnect (uc->client, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (uc->client);
     uc->client = NULL;
   }
   if (NULL != uc->dsh)
@@ -803,7 +803,7 @@ GNUNET_FS_unindex_stop (struct GNUNET_FS_UnindexContext *uc)
   }
   if (uc->client != NULL)
   {
-    GNUNET_CLIENT_disconnect (uc->client, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (uc->client);
     uc->client = NULL;
   }
   if (NULL != uc->dsh)