diff options
author | LRN <lrn1986@gmail.com> | 2013-03-20 18:50:12 +0000 |
---|---|---|
committer | LRN <lrn1986@gmail.com> | 2013-03-20 18:50:12 +0000 |
commit | 41646c7ce6e3d1711beb4b95da08afbd5b79d097 (patch) | |
tree | 666d56f69347402bf531f7aec2052a83c5df1b7d /src/arm | |
parent | 7c49614b1e70bbc8f1310dca8a17dceda412b091 (diff) | |
download | gnunet-41646c7ce6e3d1711beb4b95da08afbd5b79d097.tar.gz gnunet-41646c7ce6e3d1711beb4b95da08afbd5b79d097.zip |
disconnect -> disconnect_and_free rename
Diffstat (limited to 'src/arm')
-rw-r--r-- | src/arm/arm_api.c | 4 | ||||
-rw-r--r-- | src/arm/gnunet-arm.c | 2 | ||||
-rw-r--r-- | src/arm/test_arm_api.c | 2 | ||||
-rw-r--r-- | src/arm/test_exponential_backoff.c | 2 | ||||
-rw-r--r-- | src/arm/test_gnunet_service_arm.c | 2 |
5 files changed, 6 insertions, 6 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, | |||
451 | * @param h the handle that was being used | 451 | * @param h the handle that was being used |
452 | */ | 452 | */ |
453 | void | 453 | void |
454 | GNUNET_ARM_disconnect (struct GNUNET_ARM_Handle *handle) | 454 | GNUNET_ARM_disconnect_and_free (struct GNUNET_ARM_Handle *handle) |
455 | { | 455 | { |
456 | LOG (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting from ARM service\n"); | 456 | LOG (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting from ARM service\n"); |
457 | if (NULL != handle->cth) | 457 | if (NULL != handle->cth) |
@@ -783,7 +783,7 @@ GNUNET_ARM_request_service_start (struct GNUNET_ARM_Handle *h, | |||
783 | * Stopping arm itself will not invalidate its handle, and | 783 | * Stopping arm itself will not invalidate its handle, and |
784 | * ARM API will try to restore connection to the ARM service, | 784 | * ARM API will try to restore connection to the ARM service, |
785 | * even if ARM connection was lost because you asked for ARM to be stopped. | 785 | * even if ARM connection was lost because you asked for ARM to be stopped. |
786 | * Call GNUNET_ARM_disconnect () to free the handle and prevent | 786 | * Call GNUNET_ARM_disconnect_and_free () to free the handle and prevent |
787 | * further connection attempts. | 787 | * further connection attempts. |
788 | * | 788 | * |
789 | * @param h handle to ARM | 789 | * @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 () | |||
178 | static void | 178 | static void |
179 | shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 179 | shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
180 | { | 180 | { |
181 | GNUNET_ARM_disconnect (h); | 181 | GNUNET_ARM_disconnect_and_free (h); |
182 | GNUNET_ARM_monitor_disconnect (m); | 182 | GNUNET_ARM_monitor_disconnect (m); |
183 | h = NULL; | 183 | h = NULL; |
184 | m = NULL; | 184 | 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 | |||
114 | static void | 114 | static void |
115 | trigger_disconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 115 | trigger_disconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
116 | { | 116 | { |
117 | GNUNET_ARM_disconnect ((struct GNUNET_ARM_Handle *) cls); | 117 | GNUNET_ARM_disconnect_and_free ((struct GNUNET_ARM_Handle *) cls); |
118 | } | 118 | } |
119 | 119 | ||
120 | 120 | ||
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) | |||
279 | static void | 279 | static void |
280 | trigger_disconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 280 | trigger_disconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
281 | { | 281 | { |
282 | GNUNET_ARM_disconnect (arm); | 282 | GNUNET_ARM_disconnect_and_free (arm); |
283 | GNUNET_ARM_monitor_disconnect (mon); | 283 | GNUNET_ARM_monitor_disconnect (mon); |
284 | } | 284 | } |
285 | 285 | ||
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; | |||
49 | static void | 49 | static void |
50 | trigger_disconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 50 | trigger_disconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
51 | { | 51 | { |
52 | GNUNET_ARM_disconnect (arm); | 52 | GNUNET_ARM_disconnect_and_free (arm); |
53 | arm = NULL; | 53 | arm = NULL; |
54 | } | 54 | } |
55 | 55 | ||