7 files changed, 9 insertions, 9 deletions

diff --git a/src/arm/arm_api.c b/src/arm/arm_api.c
index d434ff3af..18b4d220c 100644
--- a/src/arm/arm_api.c
+++ b/src/arm/arm_api.c
@@ -451,7 +451,7 @@ GNUNET_ARM_connect (struct GNUNET_ARM_Handle *h,
  * @param h the handle that was being used
  */
 void
-GNUNET_ARM_disconnect (struct GNUNET_ARM_Handle *handle)
+GNUNET_ARM_disconnect_and_free (struct GNUNET_ARM_Handle *handle)
 {
   LOG (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting from ARM service\n");
   if (NULL != handle->cth)
@@ -783,7 +783,7 @@ GNUNET_ARM_request_service_start (struct GNUNET_ARM_Handle *h,
  * Stopping arm itself will not invalidate its handle, and
  * ARM API will try to restore connection to the ARM service,
  * even if ARM connection was lost because you asked for ARM to be stopped.
- * Call GNUNET_ARM_disconnect () to free the handle and prevent
+ * Call GNUNET_ARM_disconnect_and_free () to free the handle and prevent
  * further connection attempts.
  *
  * @param h handle to ARM
diff --git a/src/arm/gnunet-arm.c b/src/arm/gnunet-arm.c
index f1a4cc4bb..095d60e36 100644
--- a/src/arm/gnunet-arm.c
+++ b/src/arm/gnunet-arm.c
@@ -178,7 +178,7 @@ delete_files ()
 static void
 shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  GNUNET_ARM_disconnect (h);
+  GNUNET_ARM_disconnect_and_free (h);
   GNUNET_ARM_monitor_disconnect (m);
   h = NULL;
   m = NULL;
diff --git a/src/arm/test_arm_api.c b/src/arm/test_arm_api.c
index 5cb7cdafd..865f3dfa0 100644
--- a/src/arm/test_arm_api.c
+++ b/src/arm/test_arm_api.c
@@ -114,7 +114,7 @@ resolver_start_cb (void *cls, struct GNUNET_ARM_Handle *h, enum GNUNET_ARM_Reque
 static void
 trigger_disconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  GNUNET_ARM_disconnect ((struct GNUNET_ARM_Handle *) cls);
+  GNUNET_ARM_disconnect_and_free ((struct GNUNET_ARM_Handle *) cls);
 }
 
 
diff --git a/src/arm/test_exponential_backoff.c b/src/arm/test_exponential_backoff.c
index 8a0dba117..5613794c3 100644
--- a/src/arm/test_exponential_backoff.c
+++ b/src/arm/test_exponential_backoff.c
@@ -279,7 +279,7 @@ kill_task (void *cbData, const struct GNUNET_SCHEDULER_TaskContext *tc)
 static void
 trigger_disconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  GNUNET_ARM_disconnect (arm);
+  GNUNET_ARM_disconnect_and_free (arm);
   GNUNET_ARM_monitor_disconnect (mon);
 }
 
diff --git a/src/arm/test_gnunet_service_arm.c b/src/arm/test_gnunet_service_arm.c
index a641f10c5..50f01e932 100644
--- a/src/arm/test_gnunet_service_arm.c
+++ b/src/arm/test_gnunet_service_arm.c
@@ -49,7 +49,7 @@ static struct GNUNET_ARM_Handle *arm;
 static void
 trigger_disconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  GNUNET_ARM_disconnect (arm);
+  GNUNET_ARM_disconnect_and_free (arm);
   arm = NULL;
 }
 
diff --git a/src/include/gnunet_arm_service.h b/src/include/gnunet_arm_service.h
index be46831a4..4d0f083f7 100644
--- a/src/include/gnunet_arm_service.h
+++ b/src/include/gnunet_arm_service.h
@@ -249,7 +249,7 @@ GNUNET_ARM_connect (struct GNUNET_ARM_Handle *h,
  * @param h the handle that was being used
  */
 void
-GNUNET_ARM_disconnect (struct GNUNET_ARM_Handle *h);
+GNUNET_ARM_disconnect_and_free (struct GNUNET_ARM_Handle *h);
 
 
 /**
@@ -271,7 +271,7 @@ GNUNET_ARM_request_service_list (struct GNUNET_ARM_Handle *h,
  * Stopping arm itself will not invalidate its handle, and
  * ARM API will try to restore connection to the ARM service,
  * even if ARM connection was lost because you asked for ARM to be stopped.
- * Call GNUNET_ARM_disconnect () to free the handle and prevent
+ * Call GNUNET_ARM_disconnect_and_free () to free the handle and prevent
  * further connection attempts.
  *
  * @param h handle to ARM
diff --git a/src/regex/gnunet-regex-profiler.c b/src/regex/gnunet-regex-profiler.c
index a3b970887..057ab7056 100644
--- a/src/regex/gnunet-regex-profiler.c
+++ b/src/regex/gnunet-regex-profiler.c
@@ -1028,7 +1028,7 @@ arm_da (void *cls, void *op_result)
 
   if (NULL != peer->arm_handle)
   {
-    GNUNET_ARM_disconnect (peer->arm_handle);
+    GNUNET_ARM_disconnect_and_free (peer->arm_handle);
     peer->arm_handle = NULL;
   }
 }