[GNUnet-SVN] r26523 - in gnunet/src: arm include regex

[gnunet]

Author: LRN
Date: 2013-03-20 19:50:12 +0100 (Wed, 20 Mar 2013)
New Revision: 26523

Modified:
   gnunet/src/arm/arm_api.c
   gnunet/src/arm/gnunet-arm.c
   gnunet/src/arm/test_arm_api.c
   gnunet/src/arm/test_exponential_backoff.c
   gnunet/src/arm/test_gnunet_service_arm.c
   gnunet/src/include/gnunet_arm_service.h
   gnunet/src/regex/gnunet-regex-profiler.c
Log:
disconnect -> disconnect_and_free rename

Modified: gnunet/src/arm/arm_api.c
===================================================================
--- gnunet/src/arm/arm_api.c    2013-03-20 16:15:13 UTC (rev 26522)
+++ gnunet/src/arm/arm_api.c    2013-03-20 18:50:12 UTC (rev 26523)
@@ -451,7 +451,7 @@
  * @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 @@
  * 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

Modified: gnunet/src/arm/gnunet-arm.c
===================================================================
--- gnunet/src/arm/gnunet-arm.c 2013-03-20 16:15:13 UTC (rev 26522)
+++ gnunet/src/arm/gnunet-arm.c 2013-03-20 18:50:12 UTC (rev 26523)
@@ -178,7 +178,7 @@
 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;

Modified: gnunet/src/arm/test_arm_api.c
===================================================================
--- gnunet/src/arm/test_arm_api.c       2013-03-20 16:15:13 UTC (rev 26522)
+++ gnunet/src/arm/test_arm_api.c       2013-03-20 18:50:12 UTC (rev 26523)
@@ -114,7 +114,7 @@
 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);
 }
 
 

Modified: gnunet/src/arm/test_exponential_backoff.c
===================================================================
--- gnunet/src/arm/test_exponential_backoff.c   2013-03-20 16:15:13 UTC (rev 
26522)
+++ gnunet/src/arm/test_exponential_backoff.c   2013-03-20 18:50:12 UTC (rev 
26523)
@@ -279,7 +279,7 @@
 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);
 }
 

Modified: gnunet/src/arm/test_gnunet_service_arm.c
===================================================================
--- gnunet/src/arm/test_gnunet_service_arm.c    2013-03-20 16:15:13 UTC (rev 
26522)
+++ gnunet/src/arm/test_gnunet_service_arm.c    2013-03-20 18:50:12 UTC (rev 
26523)
@@ -49,7 +49,7 @@
 static void
 trigger_disconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  GNUNET_ARM_disconnect (arm);
+  GNUNET_ARM_disconnect_and_free (arm);
   arm = NULL;
 }
 

Modified: gnunet/src/include/gnunet_arm_service.h
===================================================================
--- gnunet/src/include/gnunet_arm_service.h     2013-03-20 16:15:13 UTC (rev 
26522)
+++ gnunet/src/include/gnunet_arm_service.h     2013-03-20 18:50:12 UTC (rev 
26523)
@@ -249,7 +249,7 @@
  * @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 @@
  * 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

Modified: gnunet/src/regex/gnunet-regex-profiler.c
===================================================================
--- gnunet/src/regex/gnunet-regex-profiler.c    2013-03-20 16:15:13 UTC (rev 
26522)
+++ gnunet/src/regex/gnunet-regex-profiler.c    2013-03-20 18:50:12 UTC (rev 
26523)
@@ -1028,7 +1028,7 @@
 
   if (NULL != peer->arm_handle)
   {
-    GNUNET_ARM_disconnect (peer->arm_handle);
+    GNUNET_ARM_disconnect_and_free (peer->arm_handle);
     peer->arm_handle = NULL;
   }
 }