diff options
author | Bart Polot <bart@net.in.tum.de> | 2012-05-08 17:10:10 +0000 |
---|---|---|
committer | Bart Polot <bart@net.in.tum.de> | 2012-05-08 17:10:10 +0000 |
commit | 16546613251edfcd595e4f584b1a2d2a414d0b1a (patch) | |
tree | 0a01bd8afdcb9501ee7f9be6d2ecc59648e40392 /src/hostlist | |
parent | 9d268909fe579e36510ef03055c6cec9baa7d07a (diff) | |
download | gnunet-16546613251edfcd595e4f584b1a2d2a414d0b1a.tar.gz gnunet-16546613251edfcd595e4f584b1a2d2a414d0b1a.zip |
Renamed GNUNET_OS_process_close to GNUNET_OS_process_destroy
Diffstat (limited to 'src/hostlist')
-rw-r--r-- | src/hostlist/test_gnunet_daemon_hostlist.c | 2 | ||||
-rw-r--r-- | src/hostlist/test_gnunet_daemon_hostlist_learning.c | 4 | ||||
-rw-r--r-- | src/hostlist/test_gnunet_daemon_hostlist_reconnect.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/hostlist/test_gnunet_daemon_hostlist.c b/src/hostlist/test_gnunet_daemon_hostlist.c index da3ab8b58..a81a7f7a4 100644 --- a/src/hostlist/test_gnunet_daemon_hostlist.c +++ b/src/hostlist/test_gnunet_daemon_hostlist.c | |||
@@ -168,7 +168,7 @@ waitpid_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
168 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); | 168 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); |
169 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", | 169 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", |
170 | GNUNET_OS_process_get_pid (p->arm_proc)); | 170 | GNUNET_OS_process_get_pid (p->arm_proc)); |
171 | GNUNET_OS_process_close (p->arm_proc); | 171 | GNUNET_OS_process_destroy (p->arm_proc); |
172 | p->arm_proc = NULL; | 172 | p->arm_proc = NULL; |
173 | #endif | 173 | #endif |
174 | GNUNET_CONFIGURATION_destroy (p->cfg); | 174 | GNUNET_CONFIGURATION_destroy (p->cfg); |
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_learning.c b/src/hostlist/test_gnunet_daemon_hostlist_learning.c index 409a3ed70..5fcbd538b 100644 --- a/src/hostlist/test_gnunet_daemon_hostlist_learning.c +++ b/src/hostlist/test_gnunet_daemon_hostlist_learning.c | |||
@@ -156,7 +156,7 @@ shutdown_testcase () | |||
156 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); | 156 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); |
157 | if (GNUNET_OS_process_wait (adv_peer.arm_proc) != GNUNET_OK) | 157 | if (GNUNET_OS_process_wait (adv_peer.arm_proc) != GNUNET_OK) |
158 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); | 158 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); |
159 | GNUNET_OS_process_close (adv_peer.arm_proc); | 159 | GNUNET_OS_process_destroy (adv_peer.arm_proc); |
160 | adv_peer.arm_proc = NULL; | 160 | adv_peer.arm_proc = NULL; |
161 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 161 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
162 | "Killing hostlist client ARM process.\n"); | 162 | "Killing hostlist client ARM process.\n"); |
@@ -164,7 +164,7 @@ shutdown_testcase () | |||
164 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); | 164 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); |
165 | if (GNUNET_OS_process_wait (learn_peer.arm_proc) != GNUNET_OK) | 165 | if (GNUNET_OS_process_wait (learn_peer.arm_proc) != GNUNET_OK) |
166 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); | 166 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); |
167 | GNUNET_OS_process_close (learn_peer.arm_proc); | 167 | GNUNET_OS_process_destroy (learn_peer.arm_proc); |
168 | learn_peer.arm_proc = NULL; | 168 | learn_peer.arm_proc = NULL; |
169 | #endif | 169 | #endif |
170 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Shutdown complete....\n"); | 170 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Shutdown complete....\n"); |
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c b/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c index a9915574b..ff6e4177d 100644 --- a/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c +++ b/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c | |||
@@ -172,7 +172,7 @@ waitpid_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
172 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); | 172 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); |
173 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", | 173 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", |
174 | GNUNET_OS_process_get_pid (p->arm_proc)); | 174 | GNUNET_OS_process_get_pid (p->arm_proc)); |
175 | GNUNET_OS_process_close (p->arm_proc); | 175 | GNUNET_OS_process_destroy (p->arm_proc); |
176 | p->arm_proc = NULL; | 176 | p->arm_proc = NULL; |
177 | #endif | 177 | #endif |
178 | GNUNET_CONFIGURATION_destroy (p->cfg); | 178 | GNUNET_CONFIGURATION_destroy (p->cfg); |