diff options
Diffstat (limited to 'src')
79 files changed, 98 insertions, 98 deletions
diff --git a/src/arm/gnunet-service-arm.c b/src/arm/gnunet-service-arm.c index 663a8e51a..45650188f 100644 --- a/src/arm/gnunet-service-arm.c +++ b/src/arm/gnunet-service-arm.c | |||
@@ -987,7 +987,7 @@ maint_child_death (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
987 | pos->name, | 987 | pos->name, |
988 | GNUNET_TIME_absolute_get_duration (pos->killed_at).rel_value); | 988 | GNUNET_TIME_absolute_get_duration (pos->killed_at).rel_value); |
989 | } | 989 | } |
990 | GNUNET_OS_process_close (pos->proc); | 990 | GNUNET_OS_process_destroy (pos->proc); |
991 | pos->proc = NULL; | 991 | pos->proc = NULL; |
992 | if (NULL != pos->killing_client) | 992 | if (NULL != pos->killing_client) |
993 | { | 993 | { |
diff --git a/src/ats/test_ats_api_bandwidth_consumption.c b/src/ats/test_ats_api_bandwidth_consumption.c index c28364713..01321e147 100644 --- a/src/ats/test_ats_api_bandwidth_consumption.c +++ b/src/ats/test_ats_api_bandwidth_consumption.c | |||
@@ -78,7 +78,7 @@ stop_arm () | |||
78 | if (0 != GNUNET_OS_process_kill (arm_proc, SIGTERM)) | 78 | if (0 != GNUNET_OS_process_kill (arm_proc, SIGTERM)) |
79 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); | 79 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); |
80 | GNUNET_OS_process_wait (arm_proc); | 80 | GNUNET_OS_process_wait (arm_proc); |
81 | GNUNET_OS_process_close (arm_proc); | 81 | GNUNET_OS_process_destroy (arm_proc); |
82 | arm_proc = NULL; | 82 | arm_proc = NULL; |
83 | } | 83 | } |
84 | 84 | ||
diff --git a/src/ats/test_ats_api_scheduling.c b/src/ats/test_ats_api_scheduling.c index 686916597..c9d2206b3 100644 --- a/src/ats/test_ats_api_scheduling.c +++ b/src/ats/test_ats_api_scheduling.c | |||
@@ -77,7 +77,7 @@ stop_arm () | |||
77 | if (0 != GNUNET_OS_process_kill (arm_proc, SIGTERM)) | 77 | if (0 != GNUNET_OS_process_kill (arm_proc, SIGTERM)) |
78 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); | 78 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); |
79 | GNUNET_OS_process_wait (arm_proc); | 79 | GNUNET_OS_process_wait (arm_proc); |
80 | GNUNET_OS_process_close (arm_proc); | 80 | GNUNET_OS_process_destroy (arm_proc); |
81 | arm_proc = NULL; | 81 | arm_proc = NULL; |
82 | } | 82 | } |
83 | 83 | ||
diff --git a/src/chat/test_chat.c b/src/chat/test_chat.c index fec5db02a..2e8272def 100644 --- a/src/chat/test_chat.c +++ b/src/chat/test_chat.c | |||
@@ -140,7 +140,7 @@ stop_arm (struct PeerContext *p) | |||
140 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); | 140 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); |
141 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", | 141 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", |
142 | GNUNET_OS_process_get_pid (p->arm_proc)); | 142 | GNUNET_OS_process_get_pid (p->arm_proc)); |
143 | GNUNET_OS_process_close (p->arm_proc); | 143 | GNUNET_OS_process_destroy (p->arm_proc); |
144 | p->arm_proc = NULL; | 144 | p->arm_proc = NULL; |
145 | #endif | 145 | #endif |
146 | GNUNET_CONFIGURATION_destroy (p->cfg); | 146 | GNUNET_CONFIGURATION_destroy (p->cfg); |
diff --git a/src/chat/test_chat_private.c b/src/chat/test_chat_private.c index cbc90656f..8b61392ca 100644 --- a/src/chat/test_chat_private.c +++ b/src/chat/test_chat_private.c | |||
@@ -154,7 +154,7 @@ stop_arm (struct PeerContext *p) | |||
154 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); | 154 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); |
155 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", | 155 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", |
156 | GNUNET_OS_process_get_pid (p->arm_proc)); | 156 | GNUNET_OS_process_get_pid (p->arm_proc)); |
157 | GNUNET_OS_process_close (p->arm_proc); | 157 | GNUNET_OS_process_destroy (p->arm_proc); |
158 | p->arm_proc = NULL; | 158 | p->arm_proc = NULL; |
159 | #endif | 159 | #endif |
160 | GNUNET_CONFIGURATION_destroy (p->cfg); | 160 | GNUNET_CONFIGURATION_destroy (p->cfg); |
diff --git a/src/core/test_core_api.c b/src/core/test_core_api.c index 271c2ce08..37d166983 100644 --- a/src/core/test_core_api.c +++ b/src/core/test_core_api.c | |||
@@ -362,7 +362,7 @@ stop_arm (struct PeerContext *p) | |||
362 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); | 362 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); |
363 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", | 363 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", |
364 | GNUNET_OS_process_get_pid (p->arm_proc)); | 364 | GNUNET_OS_process_get_pid (p->arm_proc)); |
365 | GNUNET_OS_process_close (p->arm_proc); | 365 | GNUNET_OS_process_destroy (p->arm_proc); |
366 | p->arm_proc = NULL; | 366 | p->arm_proc = NULL; |
367 | #endif | 367 | #endif |
368 | GNUNET_CONFIGURATION_destroy (p->cfg); | 368 | GNUNET_CONFIGURATION_destroy (p->cfg); |
diff --git a/src/core/test_core_api_reliability.c b/src/core/test_core_api_reliability.c index 645b27e74..0c6a39ffb 100644 --- a/src/core/test_core_api_reliability.c +++ b/src/core/test_core_api_reliability.c | |||
@@ -482,7 +482,7 @@ stop_arm (struct PeerContext *p) | |||
482 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); | 482 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); |
483 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", | 483 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", |
484 | GNUNET_OS_process_get_pid (p->arm_proc)); | 484 | GNUNET_OS_process_get_pid (p->arm_proc)); |
485 | GNUNET_OS_process_close (p->arm_proc); | 485 | GNUNET_OS_process_destroy (p->arm_proc); |
486 | p->arm_proc = NULL; | 486 | p->arm_proc = NULL; |
487 | #endif | 487 | #endif |
488 | GNUNET_CONFIGURATION_destroy (p->cfg); | 488 | GNUNET_CONFIGURATION_destroy (p->cfg); |
diff --git a/src/core/test_core_api_send_to_self.c b/src/core/test_core_api_send_to_self.c index 4fa73d951..b1340dcfb 100644 --- a/src/core/test_core_api_send_to_self.c +++ b/src/core/test_core_api_send_to_self.c | |||
@@ -81,7 +81,7 @@ cleanup (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tskctx) | |||
81 | 81 | ||
82 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", | 82 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", |
83 | GNUNET_OS_process_get_pid (arm_proc)); | 83 | GNUNET_OS_process_get_pid (arm_proc)); |
84 | GNUNET_OS_process_close (arm_proc); | 84 | GNUNET_OS_process_destroy (arm_proc); |
85 | arm_proc = NULL; | 85 | arm_proc = NULL; |
86 | 86 | ||
87 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Ending test.\n"); | 87 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Ending test.\n"); |
diff --git a/src/core/test_core_api_start_only.c b/src/core/test_core_api_start_only.c index 2eca57512..8c8132043 100644 --- a/src/core/test_core_api_start_only.c +++ b/src/core/test_core_api_start_only.c | |||
@@ -208,7 +208,7 @@ stop_arm (struct PeerContext *p) | |||
208 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); | 208 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); |
209 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", | 209 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", |
210 | GNUNET_OS_process_get_pid (p->arm_proc)); | 210 | GNUNET_OS_process_get_pid (p->arm_proc)); |
211 | GNUNET_OS_process_close (p->arm_proc); | 211 | GNUNET_OS_process_destroy (p->arm_proc); |
212 | p->arm_proc = NULL; | 212 | p->arm_proc = NULL; |
213 | #endif | 213 | #endif |
214 | GNUNET_CONFIGURATION_destroy (p->cfg); | 214 | GNUNET_CONFIGURATION_destroy (p->cfg); |
diff --git a/src/core/test_core_quota_compliance.c b/src/core/test_core_quota_compliance.c index 636520e69..dc345ba2b 100644 --- a/src/core/test_core_quota_compliance.c +++ b/src/core/test_core_quota_compliance.c | |||
@@ -642,7 +642,7 @@ stop_arm (struct PeerContext *p) | |||
642 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); | 642 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); |
643 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", | 643 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", |
644 | GNUNET_OS_process_get_pid (p->arm_proc)); | 644 | GNUNET_OS_process_get_pid (p->arm_proc)); |
645 | GNUNET_OS_process_close (p->arm_proc); | 645 | GNUNET_OS_process_destroy (p->arm_proc); |
646 | p->arm_proc = NULL; | 646 | p->arm_proc = NULL; |
647 | #endif | 647 | #endif |
648 | GNUNET_CONFIGURATION_destroy (p->cfg); | 648 | GNUNET_CONFIGURATION_destroy (p->cfg); |
diff --git a/src/datastore/perf_datastore_api.c b/src/datastore/perf_datastore_api.c index 296853ab4..cdbd6ae9c 100644 --- a/src/datastore/perf_datastore_api.c +++ b/src/datastore/perf_datastore_api.c | |||
@@ -360,7 +360,7 @@ check () | |||
360 | ok = 1; | 360 | ok = 1; |
361 | } | 361 | } |
362 | GNUNET_OS_process_wait (proc); | 362 | GNUNET_OS_process_wait (proc); |
363 | GNUNET_OS_process_close (proc); | 363 | GNUNET_OS_process_destroy (proc); |
364 | proc = NULL; | 364 | proc = NULL; |
365 | return ok; | 365 | return ok; |
366 | } | 366 | } |
diff --git a/src/datastore/test_datastore_api.c b/src/datastore/test_datastore_api.c index f6945ed2e..4c0736619 100644 --- a/src/datastore/test_datastore_api.c +++ b/src/datastore/test_datastore_api.c | |||
@@ -546,7 +546,7 @@ check () | |||
546 | ok = 1; | 546 | ok = 1; |
547 | } | 547 | } |
548 | GNUNET_OS_process_wait (proc); | 548 | GNUNET_OS_process_wait (proc); |
549 | GNUNET_OS_process_close (proc); | 549 | GNUNET_OS_process_destroy (proc); |
550 | proc = NULL; | 550 | proc = NULL; |
551 | #endif | 551 | #endif |
552 | if (ok != 0) | 552 | if (ok != 0) |
diff --git a/src/datastore/test_datastore_api_management.c b/src/datastore/test_datastore_api_management.c index bd0b2418c..bb3898e08 100644 --- a/src/datastore/test_datastore_api_management.c +++ b/src/datastore/test_datastore_api_management.c | |||
@@ -329,7 +329,7 @@ check () | |||
329 | ok = 1; | 329 | ok = 1; |
330 | } | 330 | } |
331 | GNUNET_OS_process_wait (proc); | 331 | GNUNET_OS_process_wait (proc); |
332 | GNUNET_OS_process_close (proc); | 332 | GNUNET_OS_process_destroy (proc); |
333 | proc = NULL; | 333 | proc = NULL; |
334 | if (ok != 0) | 334 | if (ok != 0) |
335 | FPRINTF (stderr, "Missed some testcases: %u\n", ok); | 335 | FPRINTF (stderr, "Missed some testcases: %u\n", ok); |
diff --git a/src/dht/test_dht_api.c b/src/dht/test_dht_api.c index 4f96cb82b..9c6231561 100644 --- a/src/dht/test_dht_api.c +++ b/src/dht/test_dht_api.c | |||
@@ -121,7 +121,7 @@ stop_arm (struct PeerContext *p) | |||
121 | if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM)) | 121 | if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM)) |
122 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); | 122 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); |
123 | GNUNET_OS_process_wait (p->arm_proc); | 123 | GNUNET_OS_process_wait (p->arm_proc); |
124 | GNUNET_OS_process_close (p->arm_proc); | 124 | GNUNET_OS_process_destroy (p->arm_proc); |
125 | p->arm_proc = NULL; | 125 | p->arm_proc = NULL; |
126 | #endif | 126 | #endif |
127 | GNUNET_CONFIGURATION_destroy (p->cfg); | 127 | GNUNET_CONFIGURATION_destroy (p->cfg); |
diff --git a/src/fs/test_fs.c b/src/fs/test_fs.c index 5ec5ab053..8df9662a1 100644 --- a/src/fs/test_fs.c +++ b/src/fs/test_fs.c | |||
@@ -241,7 +241,7 @@ FAILURE: | |||
241 | 241 | ||
242 | #if START_DAEMON | 242 | #if START_DAEMON |
243 | GNUNET_GE_ASSERT (NULL, GNUNET_OK == GNUNET_daemon_stop (NULL, daemon)); | 243 | GNUNET_GE_ASSERT (NULL, GNUNET_OK == GNUNET_daemon_stop (NULL, daemon)); |
244 | GNUNET_OS_process_close (daemon); | 244 | GNUNET_OS_process_destroy (daemon); |
245 | #endif | 245 | #endif |
246 | GNUNET_GC_free (cfg); | 246 | GNUNET_GC_free (cfg); |
247 | 247 | ||
diff --git a/src/fs/test_fs_download.c b/src/fs/test_fs_download.c index 198a8154e..278197478 100644 --- a/src/fs/test_fs_download.c +++ b/src/fs/test_fs_download.c | |||
@@ -268,7 +268,7 @@ stop_arm (struct PeerContext *p) | |||
268 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); | 268 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); |
269 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", | 269 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", |
270 | GNUNET_OS_process_get_pid (p->arm_proc)); | 270 | GNUNET_OS_process_get_pid (p->arm_proc)); |
271 | GNUNET_OS_process_close (p->arm_proc); | 271 | GNUNET_OS_process_destroy (p->arm_proc); |
272 | p->arm_proc = NULL; | 272 | p->arm_proc = NULL; |
273 | } | 273 | } |
274 | #endif | 274 | #endif |
diff --git a/src/fs/test_fs_download_indexed.c b/src/fs/test_fs_download_indexed.c index 5b56ed787..d16aa97f1 100644 --- a/src/fs/test_fs_download_indexed.c +++ b/src/fs/test_fs_download_indexed.c | |||
@@ -270,7 +270,7 @@ stop_arm (struct PeerContext *p) | |||
270 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); | 270 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); |
271 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", | 271 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", |
272 | GNUNET_OS_process_get_pid (p->arm_proc)); | 272 | GNUNET_OS_process_get_pid (p->arm_proc)); |
273 | GNUNET_OS_process_close (p->arm_proc); | 273 | GNUNET_OS_process_destroy (p->arm_proc); |
274 | p->arm_proc = NULL; | 274 | p->arm_proc = NULL; |
275 | } | 275 | } |
276 | #endif | 276 | #endif |
diff --git a/src/fs/test_fs_download_persistence.c b/src/fs/test_fs_download_persistence.c index 3a6d9553e..ba776dd03 100644 --- a/src/fs/test_fs_download_persistence.c +++ b/src/fs/test_fs_download_persistence.c | |||
@@ -318,7 +318,7 @@ stop_arm (struct PeerContext *p) | |||
318 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); | 318 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); |
319 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", | 319 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", |
320 | GNUNET_OS_process_get_pid (p->arm_proc)); | 320 | GNUNET_OS_process_get_pid (p->arm_proc)); |
321 | GNUNET_OS_process_close (p->arm_proc); | 321 | GNUNET_OS_process_destroy (p->arm_proc); |
322 | p->arm_proc = NULL; | 322 | p->arm_proc = NULL; |
323 | } | 323 | } |
324 | #endif | 324 | #endif |
diff --git a/src/fs/test_fs_download_recursive.c b/src/fs/test_fs_download_recursive.c index bd99f0600..bcbfe2b2a 100644 --- a/src/fs/test_fs_download_recursive.c +++ b/src/fs/test_fs_download_recursive.c | |||
@@ -365,7 +365,7 @@ FAILURE: | |||
365 | 365 | ||
366 | #if START_DAEMON | 366 | #if START_DAEMON |
367 | GNUNET_GE_BREAK (NULL, GNUNET_OK == GNUNET_daemon_stop (NULL, daemon)); | 367 | GNUNET_GE_BREAK (NULL, GNUNET_OK == GNUNET_daemon_stop (NULL, daemon)); |
368 | GNUNET_OS_process_close (daemon); | 368 | GNUNET_OS_process_destroy (daemon); |
369 | daemon = NULL; | 369 | daemon = NULL; |
370 | #endif | 370 | #endif |
371 | GNUNET_GC_free (cfg); | 371 | GNUNET_GC_free (cfg); |
diff --git a/src/fs/test_fs_list_indexed.c b/src/fs/test_fs_list_indexed.c index 535f8ef58..d046a20c6 100644 --- a/src/fs/test_fs_list_indexed.c +++ b/src/fs/test_fs_list_indexed.c | |||
@@ -211,7 +211,7 @@ stop_arm (struct PeerContext *p) | |||
211 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); | 211 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); |
212 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", | 212 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", |
213 | GNUNET_OS_process_get_pid (p->arm_proc)); | 213 | GNUNET_OS_process_get_pid (p->arm_proc)); |
214 | GNUNET_OS_process_close (p->arm_proc); | 214 | GNUNET_OS_process_destroy (p->arm_proc); |
215 | p->arm_proc = NULL; | 215 | p->arm_proc = NULL; |
216 | } | 216 | } |
217 | #endif | 217 | #endif |
diff --git a/src/fs/test_fs_namespace.c b/src/fs/test_fs_namespace.c index d25fd6f83..9305a501f 100644 --- a/src/fs/test_fs_namespace.c +++ b/src/fs/test_fs_namespace.c | |||
@@ -90,7 +90,7 @@ stop_arm (struct PeerContext *p) | |||
90 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); | 90 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); |
91 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", | 91 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", |
92 | GNUNET_OS_process_get_pid (p->arm_proc)); | 92 | GNUNET_OS_process_get_pid (p->arm_proc)); |
93 | GNUNET_OS_process_close (p->arm_proc); | 93 | GNUNET_OS_process_destroy (p->arm_proc); |
94 | p->arm_proc = NULL; | 94 | p->arm_proc = NULL; |
95 | } | 95 | } |
96 | #endif | 96 | #endif |
diff --git a/src/fs/test_fs_namespace_list_updateable.c b/src/fs/test_fs_namespace_list_updateable.c index 44775ac0e..2cec67ddc 100644 --- a/src/fs/test_fs_namespace_list_updateable.c +++ b/src/fs/test_fs_namespace_list_updateable.c | |||
@@ -94,7 +94,7 @@ stop_arm (struct PeerContext *p) | |||
94 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); | 94 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); |
95 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", | 95 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", |
96 | GNUNET_OS_process_get_pid (p->arm_proc)); | 96 | GNUNET_OS_process_get_pid (p->arm_proc)); |
97 | GNUNET_OS_process_close (p->arm_proc); | 97 | GNUNET_OS_process_destroy (p->arm_proc); |
98 | p->arm_proc = NULL; | 98 | p->arm_proc = NULL; |
99 | } | 99 | } |
100 | #endif | 100 | #endif |
diff --git a/src/fs/test_fs_publish.c b/src/fs/test_fs_publish.c index e52743876..1560f4ea3 100644 --- a/src/fs/test_fs_publish.c +++ b/src/fs/test_fs_publish.c | |||
@@ -196,7 +196,7 @@ stop_arm (struct PeerContext *p) | |||
196 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); | 196 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); |
197 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", | 197 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", |
198 | GNUNET_OS_process_get_pid (p->arm_proc)); | 198 | GNUNET_OS_process_get_pid (p->arm_proc)); |
199 | GNUNET_OS_process_close (p->arm_proc); | 199 | GNUNET_OS_process_destroy (p->arm_proc); |
200 | p->arm_proc = NULL; | 200 | p->arm_proc = NULL; |
201 | } | 201 | } |
202 | #endif | 202 | #endif |
diff --git a/src/fs/test_fs_publish_persistence.c b/src/fs/test_fs_publish_persistence.c index 7707eac32..7d3bc32ae 100644 --- a/src/fs/test_fs_publish_persistence.c +++ b/src/fs/test_fs_publish_persistence.c | |||
@@ -259,7 +259,7 @@ stop_arm (struct PeerContext *p) | |||
259 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); | 259 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); |
260 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", | 260 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", |
261 | GNUNET_OS_process_get_pid (p->arm_proc)); | 261 | GNUNET_OS_process_get_pid (p->arm_proc)); |
262 | GNUNET_OS_process_close (p->arm_proc); | 262 | GNUNET_OS_process_destroy (p->arm_proc); |
263 | p->arm_proc = NULL; | 263 | p->arm_proc = NULL; |
264 | } | 264 | } |
265 | #endif | 265 | #endif |
diff --git a/src/fs/test_fs_search.c b/src/fs/test_fs_search.c index f6c8f00f8..a3a9b5444 100644 --- a/src/fs/test_fs_search.c +++ b/src/fs/test_fs_search.c | |||
@@ -197,7 +197,7 @@ stop_arm (struct PeerContext *p) | |||
197 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); | 197 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); |
198 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", | 198 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", |
199 | GNUNET_OS_process_get_pid (p->arm_proc)); | 199 | GNUNET_OS_process_get_pid (p->arm_proc)); |
200 | GNUNET_OS_process_close (p->arm_proc); | 200 | GNUNET_OS_process_destroy (p->arm_proc); |
201 | p->arm_proc = NULL; | 201 | p->arm_proc = NULL; |
202 | } | 202 | } |
203 | #endif | 203 | #endif |
diff --git a/src/fs/test_fs_search_persistence.c b/src/fs/test_fs_search_persistence.c index 38f88a82a..d18b50eb5 100644 --- a/src/fs/test_fs_search_persistence.c +++ b/src/fs/test_fs_search_persistence.c | |||
@@ -259,7 +259,7 @@ stop_arm (struct PeerContext *p) | |||
259 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); | 259 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); |
260 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", | 260 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", |
261 | GNUNET_OS_process_get_pid (p->arm_proc)); | 261 | GNUNET_OS_process_get_pid (p->arm_proc)); |
262 | GNUNET_OS_process_close (p->arm_proc); | 262 | GNUNET_OS_process_destroy (p->arm_proc); |
263 | p->arm_proc = NULL; | 263 | p->arm_proc = NULL; |
264 | } | 264 | } |
265 | #endif | 265 | #endif |
diff --git a/src/fs/test_fs_search_probes.c b/src/fs/test_fs_search_probes.c index c1022b9aa..6f57ea8b0 100644 --- a/src/fs/test_fs_search_probes.c +++ b/src/fs/test_fs_search_probes.c | |||
@@ -200,7 +200,7 @@ stop_arm (struct PeerContext *p) | |||
200 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); | 200 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); |
201 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", | 201 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", |
202 | GNUNET_OS_process_get_pid (p->arm_proc)); | 202 | GNUNET_OS_process_get_pid (p->arm_proc)); |
203 | GNUNET_OS_process_close (p->arm_proc); | 203 | GNUNET_OS_process_destroy (p->arm_proc); |
204 | p->arm_proc = NULL; | 204 | p->arm_proc = NULL; |
205 | } | 205 | } |
206 | #endif | 206 | #endif |
diff --git a/src/fs/test_fs_search_ranking.c b/src/fs/test_fs_search_ranking.c index af4e56aef..5ad7da224 100644 --- a/src/fs/test_fs_search_ranking.c +++ b/src/fs/test_fs_search_ranking.c | |||
@@ -236,7 +236,7 @@ FAILURE: | |||
236 | 236 | ||
237 | #if START_DAEMON | 237 | #if START_DAEMON |
238 | GNUNET_GE_ASSERT (NULL, GNUNET_OK == GNUNET_daemon_stop (NULL, daemon)); | 238 | GNUNET_GE_ASSERT (NULL, GNUNET_OK == GNUNET_daemon_stop (NULL, daemon)); |
239 | GNUNET_OS_process_close (daemon); | 239 | GNUNET_OS_process_destroy (daemon); |
240 | daemon = NULL; | 240 | daemon = NULL; |
241 | #endif | 241 | #endif |
242 | GNUNET_GC_free (cfg); | 242 | GNUNET_GC_free (cfg); |
diff --git a/src/fs/test_fs_start_stop.c b/src/fs/test_fs_start_stop.c index 0ef0723f9..6bd698a43 100644 --- a/src/fs/test_fs_start_stop.c +++ b/src/fs/test_fs_start_stop.c | |||
@@ -80,7 +80,7 @@ stop_arm (struct PeerContext *p) | |||
80 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); | 80 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); |
81 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", | 81 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", |
82 | GNUNET_OS_process_get_pid (p->arm_proc)); | 82 | GNUNET_OS_process_get_pid (p->arm_proc)); |
83 | GNUNET_OS_process_close (p->arm_proc); | 83 | GNUNET_OS_process_destroy (p->arm_proc); |
84 | p->arm_proc = NULL; | 84 | p->arm_proc = NULL; |
85 | } | 85 | } |
86 | #endif | 86 | #endif |
diff --git a/src/fs/test_fs_unindex.c b/src/fs/test_fs_unindex.c index a8b68a3cf..ee76bf9f3 100644 --- a/src/fs/test_fs_unindex.c +++ b/src/fs/test_fs_unindex.c | |||
@@ -210,7 +210,7 @@ stop_arm (struct PeerContext *p) | |||
210 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); | 210 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); |
211 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", | 211 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", |
212 | GNUNET_OS_process_get_pid (p->arm_proc)); | 212 | GNUNET_OS_process_get_pid (p->arm_proc)); |
213 | GNUNET_OS_process_close (p->arm_proc); | 213 | GNUNET_OS_process_destroy (p->arm_proc); |
214 | p->arm_proc = NULL; | 214 | p->arm_proc = NULL; |
215 | } | 215 | } |
216 | #endif | 216 | #endif |
diff --git a/src/fs/test_fs_unindex_persistence.c b/src/fs/test_fs_unindex_persistence.c index 575e1715f..c6b1062e1 100644 --- a/src/fs/test_fs_unindex_persistence.c +++ b/src/fs/test_fs_unindex_persistence.c | |||
@@ -272,7 +272,7 @@ stop_arm (struct PeerContext *p) | |||
272 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); | 272 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); |
273 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", | 273 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", |
274 | GNUNET_OS_process_get_pid (p->arm_proc)); | 274 | GNUNET_OS_process_get_pid (p->arm_proc)); |
275 | GNUNET_OS_process_close (p->arm_proc); | 275 | GNUNET_OS_process_destroy (p->arm_proc); |
276 | p->arm_proc = NULL; | 276 | p->arm_proc = NULL; |
277 | } | 277 | } |
278 | #endif | 278 | #endif |
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); |
diff --git a/src/include/gnunet_os_lib.h b/src/include/gnunet_os_lib.h index d42a5c521..67b6cce0c 100644 --- a/src/include/gnunet_os_lib.h +++ b/src/include/gnunet_os_lib.h | |||
@@ -227,7 +227,7 @@ GNUNET_OS_process_kill (struct GNUNET_OS_Process *proc, int sig); | |||
227 | * @param proc pointer to process structure | 227 | * @param proc pointer to process structure |
228 | */ | 228 | */ |
229 | void | 229 | void |
230 | GNUNET_OS_process_close (struct GNUNET_OS_Process *proc); | 230 | GNUNET_OS_process_destroy (struct GNUNET_OS_Process *proc); |
231 | 231 | ||
232 | 232 | ||
233 | /** | 233 | /** |
diff --git a/src/lockmanager/test_lockmanager_api.c b/src/lockmanager/test_lockmanager_api.c index 9edb7bdae..a5877af7e 100644 --- a/src/lockmanager/test_lockmanager_api.c +++ b/src/lockmanager/test_lockmanager_api.c | |||
@@ -90,7 +90,7 @@ do_shutdown (void *cls, const const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
90 | "Kill gnunet-service-arm manually\n"); | 90 | "Kill gnunet-service-arm manually\n"); |
91 | } | 91 | } |
92 | GNUNET_OS_process_wait (arm_pid); | 92 | GNUNET_OS_process_wait (arm_pid); |
93 | GNUNET_OS_process_close (arm_pid); | 93 | GNUNET_OS_process_destroy (arm_pid); |
94 | 94 | ||
95 | if (NULL != config) | 95 | if (NULL != config) |
96 | GNUNET_CONFIGURATION_destroy (config); | 96 | GNUNET_CONFIGURATION_destroy (config); |
diff --git a/src/mesh/test_mesh_api.c b/src/mesh/test_mesh_api.c index fbc1fbaff..1e12e9b82 100644 --- a/src/mesh/test_mesh_api.c +++ b/src/mesh/test_mesh_api.c | |||
@@ -85,7 +85,7 @@ do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
85 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); | 85 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); |
86 | } | 86 | } |
87 | GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (arm_pid)); | 87 | GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (arm_pid)); |
88 | GNUNET_OS_process_close (arm_pid); | 88 | GNUNET_OS_process_destroy (arm_pid); |
89 | } | 89 | } |
90 | 90 | ||
91 | static void | 91 | static void |
diff --git a/src/mesh/test_mesh_local_1.c b/src/mesh/test_mesh_local_1.c index 73e2bdc13..d80bee8aa 100644 --- a/src/mesh/test_mesh_local_1.c +++ b/src/mesh/test_mesh_local_1.c | |||
@@ -77,7 +77,7 @@ do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
77 | } | 77 | } |
78 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: Wait\n"); | 78 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: Wait\n"); |
79 | GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (arm_pid)); | 79 | GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (arm_pid)); |
80 | GNUNET_OS_process_close (arm_pid); | 80 | GNUNET_OS_process_destroy (arm_pid); |
81 | } | 81 | } |
82 | 82 | ||
83 | 83 | ||
diff --git a/src/mesh/test_mesh_local_2.c b/src/mesh/test_mesh_local_2.c index b185f1b84..d495b7161 100644 --- a/src/mesh/test_mesh_local_2.c +++ b/src/mesh/test_mesh_local_2.c | |||
@@ -76,7 +76,7 @@ do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
76 | } | 76 | } |
77 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: Wait\n"); | 77 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: Wait\n"); |
78 | GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (arm_pid)); | 78 | GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (arm_pid)); |
79 | GNUNET_OS_process_close (arm_pid); | 79 | GNUNET_OS_process_destroy (arm_pid); |
80 | } | 80 | } |
81 | 81 | ||
82 | 82 | ||
diff --git a/src/namestore/test_namestore_api.c b/src/namestore/test_namestore_api.c index 7e8de7374..c28220fb7 100644 --- a/src/namestore/test_namestore_api.c +++ b/src/namestore/test_namestore_api.c | |||
@@ -66,7 +66,7 @@ stop_arm () | |||
66 | if (0 != GNUNET_OS_process_kill (arm, SIGTERM)) | 66 | if (0 != GNUNET_OS_process_kill (arm, SIGTERM)) |
67 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); | 67 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); |
68 | GNUNET_OS_process_wait (arm); | 68 | GNUNET_OS_process_wait (arm); |
69 | GNUNET_OS_process_close (arm); | 69 | GNUNET_OS_process_destroy (arm); |
70 | arm = NULL; | 70 | arm = NULL; |
71 | } | 71 | } |
72 | } | 72 | } |
diff --git a/src/namestore/test_namestore_api_create.c b/src/namestore/test_namestore_api_create.c index 7d60d8951..8a2c8a903 100644 --- a/src/namestore/test_namestore_api_create.c +++ b/src/namestore/test_namestore_api_create.c | |||
@@ -79,7 +79,7 @@ stop_arm () | |||
79 | if (0 != GNUNET_OS_process_kill (arm, SIGTERM)) | 79 | if (0 != GNUNET_OS_process_kill (arm, SIGTERM)) |
80 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); | 80 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); |
81 | GNUNET_OS_process_wait (arm); | 81 | GNUNET_OS_process_wait (arm); |
82 | GNUNET_OS_process_close (arm); | 82 | GNUNET_OS_process_destroy (arm); |
83 | arm = NULL; | 83 | arm = NULL; |
84 | } | 84 | } |
85 | } | 85 | } |
diff --git a/src/namestore/test_namestore_api_create_update.c b/src/namestore/test_namestore_api_create_update.c index a4f454974..d11c894cc 100644 --- a/src/namestore/test_namestore_api_create_update.c +++ b/src/namestore/test_namestore_api_create_update.c | |||
@@ -79,7 +79,7 @@ stop_arm () | |||
79 | if (0 != GNUNET_OS_process_kill (arm, SIGTERM)) | 79 | if (0 != GNUNET_OS_process_kill (arm, SIGTERM)) |
80 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); | 80 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); |
81 | GNUNET_OS_process_wait (arm); | 81 | GNUNET_OS_process_wait (arm); |
82 | GNUNET_OS_process_close (arm); | 82 | GNUNET_OS_process_destroy (arm); |
83 | arm = NULL; | 83 | arm = NULL; |
84 | } | 84 | } |
85 | } | 85 | } |
diff --git a/src/namestore/test_namestore_api_lookup.c b/src/namestore/test_namestore_api_lookup.c index b6b681566..3857ca141 100644 --- a/src/namestore/test_namestore_api_lookup.c +++ b/src/namestore/test_namestore_api_lookup.c | |||
@@ -73,7 +73,7 @@ stop_arm () | |||
73 | if (0 != GNUNET_OS_process_kill (arm, SIGTERM)) | 73 | if (0 != GNUNET_OS_process_kill (arm, SIGTERM)) |
74 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); | 74 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); |
75 | GNUNET_OS_process_wait (arm); | 75 | GNUNET_OS_process_wait (arm); |
76 | GNUNET_OS_process_close (arm); | 76 | GNUNET_OS_process_destroy (arm); |
77 | arm = NULL; | 77 | arm = NULL; |
78 | } | 78 | } |
79 | } | 79 | } |
diff --git a/src/namestore/test_namestore_api_lookup_specific_type.c b/src/namestore/test_namestore_api_lookup_specific_type.c index 3cc2ad7ba..03a6887c6 100644 --- a/src/namestore/test_namestore_api_lookup_specific_type.c +++ b/src/namestore/test_namestore_api_lookup_specific_type.c | |||
@@ -76,7 +76,7 @@ stop_arm () | |||
76 | if (0 != GNUNET_OS_process_kill (arm, SIGTERM)) | 76 | if (0 != GNUNET_OS_process_kill (arm, SIGTERM)) |
77 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); | 77 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); |
78 | GNUNET_OS_process_wait (arm); | 78 | GNUNET_OS_process_wait (arm); |
79 | GNUNET_OS_process_close (arm); | 79 | GNUNET_OS_process_destroy (arm); |
80 | arm = NULL; | 80 | arm = NULL; |
81 | } | 81 | } |
82 | } | 82 | } |
diff --git a/src/namestore/test_namestore_api_put.c b/src/namestore/test_namestore_api_put.c index 8941b6b6d..cdec716da 100644 --- a/src/namestore/test_namestore_api_put.c +++ b/src/namestore/test_namestore_api_put.c | |||
@@ -68,7 +68,7 @@ stop_arm () | |||
68 | if (0 != GNUNET_OS_process_kill (arm, SIGTERM)) | 68 | if (0 != GNUNET_OS_process_kill (arm, SIGTERM)) |
69 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); | 69 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); |
70 | GNUNET_OS_process_wait (arm); | 70 | GNUNET_OS_process_wait (arm); |
71 | GNUNET_OS_process_close (arm); | 71 | GNUNET_OS_process_destroy (arm); |
72 | arm = NULL; | 72 | arm = NULL; |
73 | } | 73 | } |
74 | } | 74 | } |
diff --git a/src/namestore/test_namestore_api_remove.c b/src/namestore/test_namestore_api_remove.c index 89a6fab17..d1b566659 100644 --- a/src/namestore/test_namestore_api_remove.c +++ b/src/namestore/test_namestore_api_remove.c | |||
@@ -77,7 +77,7 @@ stop_arm () | |||
77 | if (0 != GNUNET_OS_process_kill (arm, SIGTERM)) | 77 | if (0 != GNUNET_OS_process_kill (arm, SIGTERM)) |
78 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); | 78 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); |
79 | GNUNET_OS_process_wait (arm); | 79 | GNUNET_OS_process_wait (arm); |
80 | GNUNET_OS_process_close (arm); | 80 | GNUNET_OS_process_destroy (arm); |
81 | arm = NULL; | 81 | arm = NULL; |
82 | } | 82 | } |
83 | } | 83 | } |
diff --git a/src/namestore/test_namestore_api_remove_not_existing_record.c b/src/namestore/test_namestore_api_remove_not_existing_record.c index c0ace7a20..68920cb96 100644 --- a/src/namestore/test_namestore_api_remove_not_existing_record.c +++ b/src/namestore/test_namestore_api_remove_not_existing_record.c | |||
@@ -77,7 +77,7 @@ stop_arm () | |||
77 | if (0 != GNUNET_OS_process_kill (arm, SIGTERM)) | 77 | if (0 != GNUNET_OS_process_kill (arm, SIGTERM)) |
78 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); | 78 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); |
79 | GNUNET_OS_process_wait (arm); | 79 | GNUNET_OS_process_wait (arm); |
80 | GNUNET_OS_process_close (arm); | 80 | GNUNET_OS_process_destroy (arm); |
81 | arm = NULL; | 81 | arm = NULL; |
82 | } | 82 | } |
83 | } | 83 | } |
diff --git a/src/namestore/test_namestore_api_zone_iteration.c b/src/namestore/test_namestore_api_zone_iteration.c index 50aaeb470..6743146e0 100644 --- a/src/namestore/test_namestore_api_zone_iteration.c +++ b/src/namestore/test_namestore_api_zone_iteration.c | |||
@@ -81,7 +81,7 @@ stop_arm () | |||
81 | if (0 != GNUNET_OS_process_kill (arm, SIGTERM)) | 81 | if (0 != GNUNET_OS_process_kill (arm, SIGTERM)) |
82 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); | 82 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); |
83 | GNUNET_OS_process_wait (arm); | 83 | GNUNET_OS_process_wait (arm); |
84 | GNUNET_OS_process_close (arm); | 84 | GNUNET_OS_process_destroy (arm); |
85 | arm = NULL; | 85 | arm = NULL; |
86 | } | 86 | } |
87 | } | 87 | } |
diff --git a/src/namestore/test_namestore_api_zone_iteration_specific_zone.c b/src/namestore/test_namestore_api_zone_iteration_specific_zone.c index 4291b0630..192853e5a 100644 --- a/src/namestore/test_namestore_api_zone_iteration_specific_zone.c +++ b/src/namestore/test_namestore_api_zone_iteration_specific_zone.c | |||
@@ -81,7 +81,7 @@ stop_arm () | |||
81 | if (0 != GNUNET_OS_process_kill (arm, SIGTERM)) | 81 | if (0 != GNUNET_OS_process_kill (arm, SIGTERM)) |
82 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); | 82 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); |
83 | GNUNET_OS_process_wait (arm); | 83 | GNUNET_OS_process_wait (arm); |
84 | GNUNET_OS_process_close (arm); | 84 | GNUNET_OS_process_destroy (arm); |
85 | arm = NULL; | 85 | arm = NULL; |
86 | } | 86 | } |
87 | } | 87 | } |
diff --git a/src/namestore/test_namestore_api_zone_iteration_stop.c b/src/namestore/test_namestore_api_zone_iteration_stop.c index b48ab0781..f5f2e3a34 100644 --- a/src/namestore/test_namestore_api_zone_iteration_stop.c +++ b/src/namestore/test_namestore_api_zone_iteration_stop.c | |||
@@ -81,7 +81,7 @@ stop_arm () | |||
81 | if (0 != GNUNET_OS_process_kill (arm, SIGTERM)) | 81 | if (0 != GNUNET_OS_process_kill (arm, SIGTERM)) |
82 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); | 82 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); |
83 | GNUNET_OS_process_wait (arm); | 83 | GNUNET_OS_process_wait (arm); |
84 | GNUNET_OS_process_close (arm); | 84 | GNUNET_OS_process_destroy (arm); |
85 | arm = NULL; | 85 | arm = NULL; |
86 | } | 86 | } |
87 | } | 87 | } |
diff --git a/src/namestore/test_namestore_api_zone_to_name.c b/src/namestore/test_namestore_api_zone_to_name.c index be90663f0..6efbaf534 100644 --- a/src/namestore/test_namestore_api_zone_to_name.c +++ b/src/namestore/test_namestore_api_zone_to_name.c | |||
@@ -77,7 +77,7 @@ stop_arm () | |||
77 | if (0 != GNUNET_OS_process_kill (arm, SIGTERM)) | 77 | if (0 != GNUNET_OS_process_kill (arm, SIGTERM)) |
78 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); | 78 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); |
79 | GNUNET_OS_process_wait (arm); | 79 | GNUNET_OS_process_wait (arm); |
80 | GNUNET_OS_process_close (arm); | 80 | GNUNET_OS_process_destroy (arm); |
81 | arm = NULL; | 81 | arm = NULL; |
82 | } | 82 | } |
83 | } | 83 | } |
diff --git a/src/nat/nat.c b/src/nat/nat.c index 1b6556cbf..79604da7d 100644 --- a/src/nat/nat.c +++ b/src/nat/nat.c | |||
@@ -753,7 +753,7 @@ nat_server_read (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
753 | if (0 != GNUNET_OS_process_kill (h->server_proc, SIGTERM)) | 753 | if (0 != GNUNET_OS_process_kill (h->server_proc, SIGTERM)) |
754 | GNUNET_log_from_strerror (GNUNET_ERROR_TYPE_WARNING, "nat", "kill"); | 754 | GNUNET_log_from_strerror (GNUNET_ERROR_TYPE_WARNING, "nat", "kill"); |
755 | GNUNET_OS_process_wait (h->server_proc); | 755 | GNUNET_OS_process_wait (h->server_proc); |
756 | GNUNET_OS_process_close (h->server_proc); | 756 | GNUNET_OS_process_destroy (h->server_proc); |
757 | h->server_proc = NULL; | 757 | h->server_proc = NULL; |
758 | GNUNET_DISK_pipe_close (h->server_stdout); | 758 | GNUNET_DISK_pipe_close (h->server_stdout); |
759 | h->server_stdout = NULL; | 759 | h->server_stdout = NULL; |
@@ -1263,7 +1263,7 @@ GNUNET_NAT_unregister (struct GNUNET_NAT_Handle *h) | |||
1263 | if (0 != GNUNET_OS_process_kill (h->server_proc, SIGTERM)) | 1263 | if (0 != GNUNET_OS_process_kill (h->server_proc, SIGTERM)) |
1264 | GNUNET_log_from_strerror (GNUNET_ERROR_TYPE_WARNING, "nat", "kill"); | 1264 | GNUNET_log_from_strerror (GNUNET_ERROR_TYPE_WARNING, "nat", "kill"); |
1265 | GNUNET_OS_process_wait (h->server_proc); | 1265 | GNUNET_OS_process_wait (h->server_proc); |
1266 | GNUNET_OS_process_close (h->server_proc); | 1266 | GNUNET_OS_process_destroy (h->server_proc); |
1267 | h->server_proc = NULL; | 1267 | h->server_proc = NULL; |
1268 | GNUNET_DISK_pipe_close (h->server_stdout); | 1268 | GNUNET_DISK_pipe_close (h->server_stdout); |
1269 | h->server_stdout = NULL; | 1269 | h->server_stdout = NULL; |
@@ -1341,7 +1341,7 @@ GNUNET_NAT_run_client (struct GNUNET_NAT_Handle *h, | |||
1341 | /* we know that the gnunet-helper-nat-client will terminate virtually | 1341 | /* we know that the gnunet-helper-nat-client will terminate virtually |
1342 | * instantly */ | 1342 | * instantly */ |
1343 | GNUNET_OS_process_wait (proc); | 1343 | GNUNET_OS_process_wait (proc); |
1344 | GNUNET_OS_process_close (proc); | 1344 | GNUNET_OS_process_destroy (proc); |
1345 | return GNUNET_OK; | 1345 | return GNUNET_OK; |
1346 | } | 1346 | } |
1347 | 1347 | ||
diff --git a/src/nat/nat_mini.c b/src/nat/nat_mini.c index 864a7f04e..82697a971 100644 --- a/src/nat/nat_mini.c +++ b/src/nat/nat_mini.c | |||
@@ -202,7 +202,7 @@ void | |||
202 | GNUNET_NAT_mini_get_external_ipv4_cancel (struct GNUNET_NAT_ExternalHandle *eh) | 202 | GNUNET_NAT_mini_get_external_ipv4_cancel (struct GNUNET_NAT_ExternalHandle *eh) |
203 | { | 203 | { |
204 | (void) GNUNET_OS_process_kill (eh->eip, SIGKILL); | 204 | (void) GNUNET_OS_process_kill (eh->eip, SIGKILL); |
205 | GNUNET_OS_process_close (eh->eip); | 205 | GNUNET_OS_process_destroy (eh->eip); |
206 | GNUNET_DISK_pipe_close (eh->opipe); | 206 | GNUNET_DISK_pipe_close (eh->opipe); |
207 | if (GNUNET_SCHEDULER_NO_TASK != eh->task) | 207 | if (GNUNET_SCHEDULER_NO_TASK != eh->task) |
208 | GNUNET_SCHEDULER_cancel (eh->task); | 208 | GNUNET_SCHEDULER_cancel (eh->task); |
diff --git a/src/nat/test_nat_test.c b/src/nat/test_nat_test.c index 64617880a..846d9b08e 100644 --- a/src/nat/test_nat_test.c +++ b/src/nat/test_nat_test.c | |||
@@ -129,7 +129,7 @@ main (int argc, char *const argv[]) | |||
129 | NULL); | 129 | NULL); |
130 | GNUNET_break (0 == GNUNET_OS_process_kill (gns, SIGTERM)); | 130 | GNUNET_break (0 == GNUNET_OS_process_kill (gns, SIGTERM)); |
131 | GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (gns)); | 131 | GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (gns)); |
132 | GNUNET_OS_process_close (gns); | 132 | GNUNET_OS_process_destroy (gns); |
133 | return ret; | 133 | return ret; |
134 | } | 134 | } |
135 | 135 | ||
diff --git a/src/nse/test_nse_api.c b/src/nse/test_nse_api.c index 658c8b9a5..f99cb3b03 100644 --- a/src/nse/test_nse_api.c +++ b/src/nse/test_nse_api.c | |||
@@ -53,7 +53,7 @@ stop_arm (struct PeerContext *p) | |||
53 | if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM)) | 53 | if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM)) |
54 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); | 54 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); |
55 | GNUNET_OS_process_wait (p->arm_proc); | 55 | GNUNET_OS_process_wait (p->arm_proc); |
56 | GNUNET_OS_process_close (p->arm_proc); | 56 | GNUNET_OS_process_destroy (p->arm_proc); |
57 | p->arm_proc = NULL; | 57 | p->arm_proc = NULL; |
58 | #endif | 58 | #endif |
59 | GNUNET_CONFIGURATION_destroy (p->cfg); | 59 | GNUNET_CONFIGURATION_destroy (p->cfg); |
diff --git a/src/peerinfo/perf_peerinfo_api.c b/src/peerinfo/perf_peerinfo_api.c index aa32a2f09..34888fada 100755 --- a/src/peerinfo/perf_peerinfo_api.c +++ b/src/peerinfo/perf_peerinfo_api.c | |||
@@ -166,7 +166,7 @@ check () | |||
166 | ok = 1; | 166 | ok = 1; |
167 | } | 167 | } |
168 | GNUNET_OS_process_wait (proc); | 168 | GNUNET_OS_process_wait (proc); |
169 | GNUNET_OS_process_close (proc); | 169 | GNUNET_OS_process_destroy (proc); |
170 | proc = NULL; | 170 | proc = NULL; |
171 | #endif | 171 | #endif |
172 | return ok; | 172 | return ok; |
diff --git a/src/peerinfo/test_peerinfo_api.c b/src/peerinfo/test_peerinfo_api.c index 57402a0b1..e66878ea6 100644 --- a/src/peerinfo/test_peerinfo_api.c +++ b/src/peerinfo/test_peerinfo_api.c | |||
@@ -188,7 +188,7 @@ check () | |||
188 | ok = 1; | 188 | ok = 1; |
189 | } | 189 | } |
190 | GNUNET_OS_process_wait (proc); | 190 | GNUNET_OS_process_wait (proc); |
191 | GNUNET_OS_process_close (proc); | 191 | GNUNET_OS_process_destroy (proc); |
192 | proc = NULL; | 192 | proc = NULL; |
193 | return ok; | 193 | return ok; |
194 | } | 194 | } |
diff --git a/src/statistics/test_statistics_api.c b/src/statistics/test_statistics_api.c index 84d3f5a23..11f02b817 100644 --- a/src/statistics/test_statistics_api.c +++ b/src/statistics/test_statistics_api.c | |||
@@ -153,7 +153,7 @@ check () | |||
153 | ok = 1; | 153 | ok = 1; |
154 | } | 154 | } |
155 | GNUNET_OS_process_wait (proc); | 155 | GNUNET_OS_process_wait (proc); |
156 | GNUNET_OS_process_close (proc); | 156 | GNUNET_OS_process_destroy (proc); |
157 | proc = NULL; | 157 | proc = NULL; |
158 | #endif | 158 | #endif |
159 | if (ok != 0) | 159 | if (ok != 0) |
@@ -175,7 +175,7 @@ check () | |||
175 | ok = 1; | 175 | ok = 1; |
176 | } | 176 | } |
177 | GNUNET_OS_process_wait (proc); | 177 | GNUNET_OS_process_wait (proc); |
178 | GNUNET_OS_process_close (proc); | 178 | GNUNET_OS_process_destroy (proc); |
179 | proc = NULL; | 179 | proc = NULL; |
180 | #endif | 180 | #endif |
181 | return ok; | 181 | return ok; |
diff --git a/src/statistics/test_statistics_api_loop.c b/src/statistics/test_statistics_api_loop.c index 32b176caa..58114f278 100644 --- a/src/statistics/test_statistics_api_loop.c +++ b/src/statistics/test_statistics_api_loop.c | |||
@@ -114,7 +114,7 @@ check () | |||
114 | ok = 1; | 114 | ok = 1; |
115 | } | 115 | } |
116 | GNUNET_OS_process_wait (proc); | 116 | GNUNET_OS_process_wait (proc); |
117 | GNUNET_OS_process_close (proc); | 117 | GNUNET_OS_process_destroy (proc); |
118 | proc = NULL; | 118 | proc = NULL; |
119 | #endif | 119 | #endif |
120 | return ok; | 120 | return ok; |
diff --git a/src/statistics/test_statistics_api_watch.c b/src/statistics/test_statistics_api_watch.c index 979b5610e..e976bd473 100644 --- a/src/statistics/test_statistics_api_watch.c +++ b/src/statistics/test_statistics_api_watch.c | |||
@@ -145,7 +145,7 @@ check () | |||
145 | ok = 1; | 145 | ok = 1; |
146 | } | 146 | } |
147 | GNUNET_OS_process_wait (proc); | 147 | GNUNET_OS_process_wait (proc); |
148 | GNUNET_OS_process_close (proc); | 148 | GNUNET_OS_process_destroy (proc); |
149 | proc = NULL; | 149 | proc = NULL; |
150 | #endif | 150 | #endif |
151 | return ok; | 151 | return ok; |
diff --git a/src/statistics/test_statistics_api_watch_zero_value.c b/src/statistics/test_statistics_api_watch_zero_value.c index 9df09e45a..9fadf6a6c 100644 --- a/src/statistics/test_statistics_api_watch_zero_value.c +++ b/src/statistics/test_statistics_api_watch_zero_value.c | |||
@@ -179,7 +179,7 @@ check () | |||
179 | ok = 1; | 179 | ok = 1; |
180 | } | 180 | } |
181 | GNUNET_OS_process_wait (proc); | 181 | GNUNET_OS_process_wait (proc); |
182 | GNUNET_OS_process_close (proc); | 182 | GNUNET_OS_process_destroy (proc); |
183 | proc = NULL; | 183 | proc = NULL; |
184 | #endif | 184 | #endif |
185 | if ((0 == ok) && (0 == ok2)) | 185 | if ((0 == ok) && (0 == ok2)) |
diff --git a/src/stream/test_stream_api.c b/src/stream/test_stream_api.c index 2eeedeec5..84c486763 100644 --- a/src/stream/test_stream_api.c +++ b/src/stream/test_stream_api.c | |||
@@ -101,7 +101,7 @@ do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
101 | /* Free the duplicated configuration */ | 101 | /* Free the duplicated configuration */ |
102 | GNUNET_CONFIGURATION_destroy (config); | 102 | GNUNET_CONFIGURATION_destroy (config); |
103 | GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (arm_pid)); | 103 | GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (arm_pid)); |
104 | GNUNET_OS_process_close (arm_pid); | 104 | GNUNET_OS_process_destroy (arm_pid); |
105 | } | 105 | } |
106 | 106 | ||
107 | 107 | ||
diff --git a/src/stream/test_stream_local.c b/src/stream/test_stream_local.c index 3bc7731b2..63a67ac3f 100644 --- a/src/stream/test_stream_local.c +++ b/src/stream/test_stream_local.c | |||
@@ -181,7 +181,7 @@ do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
181 | GNUNET_CONFIGURATION_destroy (config_peer1); | 181 | GNUNET_CONFIGURATION_destroy (config_peer1); |
182 | GNUNET_CONFIGURATION_destroy (config_peer2); | 182 | GNUNET_CONFIGURATION_destroy (config_peer2); |
183 | GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (arm_pid)); | 183 | GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (arm_pid)); |
184 | GNUNET_OS_process_close (arm_pid); | 184 | GNUNET_OS_process_destroy (arm_pid); |
185 | } | 185 | } |
186 | 186 | ||
187 | 187 | ||
diff --git a/src/testing/test_testing_large_topology.c b/src/testing/test_testing_large_topology.c index ad6d973d2..d126ab940 100644 --- a/src/testing/test_testing_large_topology.c +++ b/src/testing/test_testing_large_topology.c | |||
@@ -192,7 +192,7 @@ gather_log_data () | |||
192 | GNUNET_OS_start_process (NULL, NULL, "./memsize.pl", "memsize.pl", | 192 | GNUNET_OS_start_process (NULL, NULL, "./memsize.pl", "memsize.pl", |
193 | "totals.txt", peer_number, connect_number, NULL); | 193 | "totals.txt", peer_number, connect_number, NULL); |
194 | GNUNET_OS_process_wait (mem_process); | 194 | GNUNET_OS_process_wait (mem_process); |
195 | GNUNET_OS_process_close (mem_process); | 195 | GNUNET_OS_process_destroy (mem_process); |
196 | mem_process = NULL; | 196 | mem_process = NULL; |
197 | } | 197 | } |
198 | 198 | ||
diff --git a/src/testing/test_testing_topology.c b/src/testing/test_testing_topology.c index ab6644c10..b21654483 100644 --- a/src/testing/test_testing_topology.c +++ b/src/testing/test_testing_topology.c | |||
@@ -197,7 +197,7 @@ gather_log_data () | |||
197 | GNUNET_OS_start_process (NULL, NULL, "./memsize.pl", "memsize.pl", | 197 | GNUNET_OS_start_process (NULL, NULL, "./memsize.pl", "memsize.pl", |
198 | "totals.txt", peer_number, connect_number, NULL); | 198 | "totals.txt", peer_number, connect_number, NULL); |
199 | GNUNET_OS_process_wait (mem_process); | 199 | GNUNET_OS_process_wait (mem_process); |
200 | GNUNET_OS_process_close (mem_process); | 200 | GNUNET_OS_process_destroy (mem_process); |
201 | mem_process = NULL; | 201 | mem_process = NULL; |
202 | } | 202 | } |
203 | #endif | 203 | #endif |
diff --git a/src/testing/testing.c b/src/testing/testing.c index 7fed33206..4b640c8e5 100644 --- a/src/testing/testing.c +++ b/src/testing/testing.c | |||
@@ -214,7 +214,7 @@ start_fsm (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
214 | cb (d->cb_cls, NULL, d->cfg, d, _("`scp' did not complete cleanly.\n")); | 214 | cb (d->cb_cls, NULL, d->cfg, d, _("`scp' did not complete cleanly.\n")); |
215 | return; | 215 | return; |
216 | } | 216 | } |
217 | GNUNET_OS_process_close (d->proc_arm_copying); | 217 | GNUNET_OS_process_destroy (d->proc_arm_copying); |
218 | d->proc_arm_copying = NULL; | 218 | d->proc_arm_copying = NULL; |
219 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 219 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
220 | "Successfully copied configuration file.\n"); | 220 | "Successfully copied configuration file.\n"); |
@@ -362,7 +362,7 @@ start_fsm (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
362 | d->pipe_stdout = NULL; | 362 | d->pipe_stdout = NULL; |
363 | (void) GNUNET_OS_process_kill (d->proc_arm_peerinfo, SIGKILL); | 363 | (void) GNUNET_OS_process_kill (d->proc_arm_peerinfo, SIGKILL); |
364 | GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (d->proc_arm_peerinfo)); | 364 | GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (d->proc_arm_peerinfo)); |
365 | GNUNET_OS_process_close (d->proc_arm_peerinfo); | 365 | GNUNET_OS_process_destroy (d->proc_arm_peerinfo); |
366 | d->proc_arm_peerinfo = NULL; | 366 | d->proc_arm_peerinfo = NULL; |
367 | if (NULL != cb) | 367 | if (NULL != cb) |
368 | cb (d->cb_cls, NULL, d->cfg, d, _("Failed to get hostkey!\n")); | 368 | cb (d->cb_cls, NULL, d->cfg, d, _("Failed to get hostkey!\n")); |
@@ -373,7 +373,7 @@ start_fsm (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
373 | d->pipe_stdout = NULL; | 373 | d->pipe_stdout = NULL; |
374 | (void) GNUNET_OS_process_kill (d->proc_arm_peerinfo, SIGKILL); | 374 | (void) GNUNET_OS_process_kill (d->proc_arm_peerinfo, SIGKILL); |
375 | GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (d->proc_arm_peerinfo)); | 375 | GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (d->proc_arm_peerinfo)); |
376 | GNUNET_OS_process_close (d->proc_arm_peerinfo); | 376 | GNUNET_OS_process_destroy (d->proc_arm_peerinfo); |
377 | d->proc_arm_peerinfo = NULL; | 377 | d->proc_arm_peerinfo = NULL; |
378 | d->have_hostkey = GNUNET_YES; | 378 | d->have_hostkey = GNUNET_YES; |
379 | if (d->hostkey_callback != NULL) | 379 | if (d->hostkey_callback != NULL) |
@@ -1414,7 +1414,7 @@ kill_and_close_process (struct GNUNET_OS_Process *proc) | |||
1414 | { | 1414 | { |
1415 | (void) GNUNET_OS_process_kill (proc, SIGKILL); | 1415 | (void) GNUNET_OS_process_kill (proc, SIGKILL); |
1416 | GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (proc)); | 1416 | GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (proc)); |
1417 | GNUNET_OS_process_close (proc); | 1417 | GNUNET_OS_process_destroy (proc); |
1418 | } | 1418 | } |
1419 | 1419 | ||
1420 | 1420 | ||
diff --git a/src/testing/testing_group.c b/src/testing/testing_group.c index 29e87f6cf..d8e969461 100644 --- a/src/testing/testing_group.c +++ b/src/testing/testing_group.c | |||
@@ -2911,7 +2911,7 @@ create_and_copy_friend_files (struct GNUNET_TESTING_PeerGroup *pg) | |||
2911 | GNUNET_OS_start_process (GNUNET_NO, NULL, NULL, "scp", "scp", mytemp, arg, NULL); | 2911 | GNUNET_OS_start_process (GNUNET_NO, NULL, NULL, "scp", "scp", mytemp, arg, NULL); |
2912 | GNUNET_assert (procarr[pg_iter] != NULL); | 2912 | GNUNET_assert (procarr[pg_iter] != NULL); |
2913 | ret = GNUNET_OS_process_wait (procarr[pg_iter]); /* FIXME: schedule this, throttle! */ | 2913 | ret = GNUNET_OS_process_wait (procarr[pg_iter]); /* FIXME: schedule this, throttle! */ |
2914 | GNUNET_OS_process_close (procarr[pg_iter]); | 2914 | GNUNET_OS_process_destroy (procarr[pg_iter]); |
2915 | if (ret != GNUNET_OK) | 2915 | if (ret != GNUNET_OK) |
2916 | { | 2916 | { |
2917 | /* FIXME: free contents of 'procarr' array */ | 2917 | /* FIXME: free contents of 'procarr' array */ |
@@ -2953,7 +2953,7 @@ create_and_copy_friend_files (struct GNUNET_TESTING_PeerGroup *pg) | |||
2953 | } | 2953 | } |
2954 | else | 2954 | else |
2955 | { | 2955 | { |
2956 | GNUNET_OS_process_close (procarr[pg_iter]); | 2956 | GNUNET_OS_process_destroy (procarr[pg_iter]); |
2957 | procarr[pg_iter] = NULL; | 2957 | procarr[pg_iter] = NULL; |
2958 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "File %d copied\n", pg_iter); | 2958 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "File %d copied\n", pg_iter); |
2959 | } | 2959 | } |
@@ -3128,7 +3128,7 @@ create_and_copy_blacklist_files (struct GNUNET_TESTING_PeerGroup *pg, | |||
3128 | } | 3128 | } |
3129 | else | 3129 | else |
3130 | { | 3130 | { |
3131 | GNUNET_OS_process_close (procarr[pg_iter]); | 3131 | GNUNET_OS_process_destroy (procarr[pg_iter]); |
3132 | procarr[pg_iter] = NULL; | 3132 | procarr[pg_iter] = NULL; |
3133 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "File %d copied\n", pg_iter); | 3133 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "File %d copied\n", pg_iter); |
3134 | } | 3134 | } |
@@ -5672,7 +5672,7 @@ check_peers_started (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
5672 | 5672 | ||
5673 | } | 5673 | } |
5674 | } | 5674 | } |
5675 | GNUNET_OS_process_close (helper->proc); | 5675 | GNUNET_OS_process_destroy (helper->proc); |
5676 | } | 5676 | } |
5677 | 5677 | ||
5678 | static void | 5678 | static void |
@@ -5935,7 +5935,7 @@ GNUNET_TESTING_daemons_start (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
5935 | GNUNET_free (tmpdir); | 5935 | GNUNET_free (tmpdir); |
5936 | GNUNET_free (arg); | 5936 | GNUNET_free (arg); |
5937 | GNUNET_OS_process_wait (proc); | 5937 | GNUNET_OS_process_wait (proc); |
5938 | GNUNET_OS_process_close (proc); | 5938 | GNUNET_OS_process_destroy (proc); |
5939 | } | 5939 | } |
5940 | GNUNET_free (baseservicehome); | 5940 | GNUNET_free (baseservicehome); |
5941 | baseservicehome = NULL; | 5941 | baseservicehome = NULL; |
@@ -6161,7 +6161,7 @@ GNUNET_TESTING_daemons_start (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
6161 | GNUNET_assert (0); | 6161 | GNUNET_assert (0); |
6162 | } | 6162 | } |
6163 | GNUNET_OS_process_wait (proc); | 6163 | GNUNET_OS_process_wait (proc); |
6164 | GNUNET_OS_process_close (proc); | 6164 | GNUNET_OS_process_destroy (proc); |
6165 | } | 6165 | } |
6166 | /* Now all the configuration files and hostkeys are copied to the remote host. Call the hostkey callback for each peer! */ | 6166 | /* Now all the configuration files and hostkeys are copied to the remote host. Call the hostkey callback for each peer! */ |
6167 | GNUNET_SCHEDULER_add_now (&call_hostkey_callbacks, pg); | 6167 | GNUNET_SCHEDULER_add_now (&call_hostkey_callbacks, pg); |
diff --git a/src/transport/gnunet-transport-certificate-creation.c b/src/transport/gnunet-transport-certificate-creation.c index 2ec8d36a6..c4c13dc2a 100644 --- a/src/transport/gnunet-transport-certificate-creation.c +++ b/src/transport/gnunet-transport-certificate-creation.c | |||
@@ -62,7 +62,7 @@ main (int argc, char **argv) | |||
62 | if (openssl == NULL) | 62 | if (openssl == NULL) |
63 | return 2; | 63 | return 2; |
64 | GNUNET_assert (GNUNET_OS_process_wait (openssl) == GNUNET_OK); | 64 | GNUNET_assert (GNUNET_OS_process_wait (openssl) == GNUNET_OK); |
65 | GNUNET_OS_process_close (openssl); | 65 | GNUNET_OS_process_destroy (openssl); |
66 | 66 | ||
67 | /* Create a self-signed certificate in batch mode using rsa key */ | 67 | /* Create a self-signed certificate in batch mode using rsa key */ |
68 | /* openssl req -batch -days 365 -out $2 -new -x509 -key $1 2> /dev/null */ | 68 | /* openssl req -batch -days 365 -out $2 -new -x509 -key $1 2> /dev/null */ |
@@ -73,7 +73,7 @@ main (int argc, char **argv) | |||
73 | if (openssl == NULL) | 73 | if (openssl == NULL) |
74 | return 3; | 74 | return 3; |
75 | GNUNET_assert (GNUNET_OS_process_wait (openssl) == GNUNET_OK); | 75 | GNUNET_assert (GNUNET_OS_process_wait (openssl) == GNUNET_OK); |
76 | GNUNET_OS_process_close (openssl); | 76 | GNUNET_OS_process_destroy (openssl); |
77 | CHMOD (argv[1], S_IRUSR); | 77 | CHMOD (argv[1], S_IRUSR); |
78 | CHMOD (argv[2], S_IRUSR); | 78 | CHMOD (argv[2], S_IRUSR); |
79 | return 0; | 79 | return 0; |
diff --git a/src/transport/gnunet-transport.c b/src/transport/gnunet-transport.c index ee23189a8..3b6b7e4c5 100644 --- a/src/transport/gnunet-transport.c +++ b/src/transport/gnunet-transport.c | |||
@@ -197,7 +197,7 @@ display_test_result (struct TestContext *tc, int result) | |||
197 | if ((0 == resolver_users) && (NULL != resolver)) | 197 | if ((0 == resolver_users) && (NULL != resolver)) |
198 | { | 198 | { |
199 | GNUNET_break (0 == GNUNET_OS_process_kill (resolver, SIGTERM)); | 199 | GNUNET_break (0 == GNUNET_OS_process_kill (resolver, SIGTERM)); |
200 | GNUNET_OS_process_close (resolver); | 200 | GNUNET_OS_process_destroy (resolver); |
201 | resolver = NULL; | 201 | resolver = NULL; |
202 | } | 202 | } |
203 | } | 203 | } |
diff --git a/src/transport/plugin_transport_http_server.c b/src/transport/plugin_transport_http_server.c index 96b465291..0ec26c88b 100644 --- a/src/transport/plugin_transport_http_server.c +++ b/src/transport/plugin_transport_http_server.c | |||
@@ -203,7 +203,7 @@ server_load_certificate (struct Plugin *plugin) | |||
203 | return GNUNET_SYSERR; | 203 | return GNUNET_SYSERR; |
204 | } | 204 | } |
205 | GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (cert_creation)); | 205 | GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (cert_creation)); |
206 | GNUNET_OS_process_close (cert_creation); | 206 | GNUNET_OS_process_destroy (cert_creation); |
207 | 207 | ||
208 | plugin->key = server_load_file (key_file); | 208 | plugin->key = server_load_file (key_file); |
209 | plugin->cert = server_load_file (cert_file); | 209 | plugin->cert = server_load_file (cert_file); |
diff --git a/src/transport/plugin_transport_wlan.c b/src/transport/plugin_transport_wlan.c index a6da2f688..7711dec06 100644 --- a/src/transport/plugin_transport_wlan.c +++ b/src/transport/plugin_transport_wlan.c | |||
@@ -1480,7 +1480,7 @@ wlan_transport_stop_wlan_helper (struct Plugin *plugin) | |||
1480 | GNUNET_DISK_pipe_close (plugin->server_stdin); | 1480 | GNUNET_DISK_pipe_close (plugin->server_stdin); |
1481 | GNUNET_OS_process_kill (plugin->server_proc, SIGKILL); | 1481 | GNUNET_OS_process_kill (plugin->server_proc, SIGKILL); |
1482 | GNUNET_OS_process_wait (plugin->server_proc); | 1482 | GNUNET_OS_process_wait (plugin->server_proc); |
1483 | GNUNET_OS_process_close (plugin->server_proc); | 1483 | GNUNET_OS_process_destroy (plugin->server_proc); |
1484 | plugin->helper_is_running = GNUNET_NO; | 1484 | plugin->helper_is_running = GNUNET_NO; |
1485 | return GNUNET_YES; | 1485 | return GNUNET_YES; |
1486 | } | 1486 | } |
diff --git a/src/transport/transport-testing.c b/src/transport/transport-testing.c index ec0800842..695c04810 100644 --- a/src/transport/transport-testing.c +++ b/src/transport/transport-testing.c | |||
@@ -377,7 +377,7 @@ GNUNET_TRANSPORT_TESTING_restart_peer (struct GNUNET_TRANSPORT_TESTING_handle | |||
377 | if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM)) | 377 | if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM)) |
378 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); | 378 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); |
379 | GNUNET_OS_process_wait (p->arm_proc); | 379 | GNUNET_OS_process_wait (p->arm_proc); |
380 | GNUNET_OS_process_close (p->arm_proc); | 380 | GNUNET_OS_process_destroy (p->arm_proc); |
381 | p->arm_proc = NULL; | 381 | p->arm_proc = NULL; |
382 | } | 382 | } |
383 | if (p->hello != NULL) | 383 | if (p->hello != NULL) |
@@ -467,7 +467,7 @@ GNUNET_TRANSPORT_TESTING_stop_peer (struct GNUNET_TRANSPORT_TESTING_handle *tth, | |||
467 | if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM)) | 467 | if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM)) |
468 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); | 468 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); |
469 | GNUNET_OS_process_wait (p->arm_proc); | 469 | GNUNET_OS_process_wait (p->arm_proc); |
470 | GNUNET_OS_process_close (p->arm_proc); | 470 | GNUNET_OS_process_destroy (p->arm_proc); |
471 | p->arm_proc = NULL; | 471 | p->arm_proc = NULL; |
472 | } | 472 | } |
473 | if (p->hostkeyfile != NULL) | 473 | if (p->hostkeyfile != NULL) |
diff --git a/src/util/crypto_random.c b/src/util/crypto_random.c index 25226a3b4..35d3c41e9 100644 --- a/src/util/crypto_random.c +++ b/src/util/crypto_random.c | |||
@@ -256,7 +256,7 @@ entropy_generator (void *cls, const char *what, int printchar, int current, | |||
256 | if (0 != GNUNET_OS_process_kill (genproc, SIGTERM)) | 256 | if (0 != GNUNET_OS_process_kill (genproc, SIGTERM)) |
257 | LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "kill"); | 257 | LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "kill"); |
258 | GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (genproc)); | 258 | GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (genproc)); |
259 | GNUNET_OS_process_close (genproc); | 259 | GNUNET_OS_process_destroy (genproc); |
260 | genproc = NULL; | 260 | genproc = NULL; |
261 | } | 261 | } |
262 | return; | 262 | return; |
@@ -274,7 +274,7 @@ entropy_generator (void *cls, const char *what, int printchar, int current, | |||
274 | if (0 != GNUNET_OS_process_kill (genproc, SIGTERM)) | 274 | if (0 != GNUNET_OS_process_kill (genproc, SIGTERM)) |
275 | LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "kill"); | 275 | LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "kill"); |
276 | GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (genproc)); | 276 | GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (genproc)); |
277 | GNUNET_OS_process_close (genproc); | 277 | GNUNET_OS_process_destroy (genproc); |
278 | genproc = NULL; | 278 | genproc = NULL; |
279 | } | 279 | } |
280 | LOG (GNUNET_ERROR_TYPE_INFO, _("Starting `%s' process to generate entropy\n"), | 280 | LOG (GNUNET_ERROR_TYPE_INFO, _("Starting `%s' process to generate entropy\n"), |
@@ -293,7 +293,7 @@ killfind () | |||
293 | if (genproc != NULL) | 293 | if (genproc != NULL) |
294 | { | 294 | { |
295 | GNUNET_OS_process_kill (genproc, SIGKILL); | 295 | GNUNET_OS_process_kill (genproc, SIGKILL); |
296 | GNUNET_OS_process_close (genproc); | 296 | GNUNET_OS_process_destroy (genproc); |
297 | genproc = NULL; | 297 | genproc = NULL; |
298 | } | 298 | } |
299 | } | 299 | } |
diff --git a/src/util/helper.c b/src/util/helper.c index 1eaadfa78..9cf39bbfd 100644 --- a/src/util/helper.c +++ b/src/util/helper.c | |||
@@ -154,7 +154,7 @@ stop_helper (struct GNUNET_HELPER_Handle *h) | |||
154 | { | 154 | { |
155 | GNUNET_break (0 == GNUNET_OS_process_kill (h->helper_proc, SIGTERM)); | 155 | GNUNET_break (0 == GNUNET_OS_process_kill (h->helper_proc, SIGTERM)); |
156 | GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (h->helper_proc)); | 156 | GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (h->helper_proc)); |
157 | GNUNET_OS_process_close (h->helper_proc); | 157 | GNUNET_OS_process_destroy (h->helper_proc); |
158 | h->helper_proc = NULL; | 158 | h->helper_proc = NULL; |
159 | } | 159 | } |
160 | if (GNUNET_SCHEDULER_NO_TASK != h->restart_task) | 160 | if (GNUNET_SCHEDULER_NO_TASK != h->restart_task) |
diff --git a/src/util/os_priority.c b/src/util/os_priority.c index cabce94f1..f374ca56d 100644 --- a/src/util/os_priority.c +++ b/src/util/os_priority.c | |||
@@ -492,7 +492,7 @@ GNUNET_OS_process_get_pid (struct GNUNET_OS_Process * proc) | |||
492 | * @param proc pointer to process structure | 492 | * @param proc pointer to process structure |
493 | */ | 493 | */ |
494 | void | 494 | void |
495 | GNUNET_OS_process_close (struct GNUNET_OS_Process *proc) | 495 | GNUNET_OS_process_destroy (struct GNUNET_OS_Process *proc) |
496 | { | 496 | { |
497 | if (NULL != proc->control_pipe) | 497 | if (NULL != proc->control_pipe) |
498 | GNUNET_DISK_file_close (proc->control_pipe); | 498 | GNUNET_DISK_file_close (proc->control_pipe); |
@@ -1723,7 +1723,7 @@ GNUNET_OS_command_stop (struct GNUNET_OS_CommandHandle *cmd) | |||
1723 | } | 1723 | } |
1724 | (void) GNUNET_OS_process_kill (cmd->eip, SIGKILL); | 1724 | (void) GNUNET_OS_process_kill (cmd->eip, SIGKILL); |
1725 | GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (cmd->eip)); | 1725 | GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (cmd->eip)); |
1726 | GNUNET_OS_process_close (cmd->eip); | 1726 | GNUNET_OS_process_destroy (cmd->eip); |
1727 | GNUNET_DISK_pipe_close (cmd->opipe); | 1727 | GNUNET_DISK_pipe_close (cmd->opipe); |
1728 | GNUNET_free (cmd); | 1728 | GNUNET_free (cmd); |
1729 | } | 1729 | } |
diff --git a/src/util/test_common_logging_runtime_loglevels.c b/src/util/test_common_logging_runtime_loglevels.c index cdf1f660d..b914ae1c6 100644 --- a/src/util/test_common_logging_runtime_loglevels.c +++ b/src/util/test_common_logging_runtime_loglevels.c | |||
@@ -55,7 +55,7 @@ end_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
55 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); | 55 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); |
56 | } | 56 | } |
57 | GNUNET_OS_process_wait (proc); | 57 | GNUNET_OS_process_wait (proc); |
58 | GNUNET_OS_process_close (proc); | 58 | GNUNET_OS_process_destroy (proc); |
59 | proc = NULL; | 59 | proc = NULL; |
60 | GNUNET_DISK_pipe_close (pipe_stdout); | 60 | GNUNET_DISK_pipe_close (pipe_stdout); |
61 | if (ok == 1) | 61 | if (ok == 1) |
diff --git a/src/util/test_os_start_process.c b/src/util/test_os_start_process.c index 3bcd636d3..0d1481857 100644 --- a/src/util/test_os_start_process.c +++ b/src/util/test_os_start_process.c | |||
@@ -56,7 +56,7 @@ end_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
56 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); | 56 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); |
57 | } | 57 | } |
58 | GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (proc)); | 58 | GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (proc)); |
59 | GNUNET_OS_process_close (proc); | 59 | GNUNET_OS_process_destroy (proc); |
60 | proc = NULL; | 60 | proc = NULL; |
61 | GNUNET_DISK_pipe_close (hello_pipe_stdout); | 61 | GNUNET_DISK_pipe_close (hello_pipe_stdout); |
62 | GNUNET_DISK_pipe_close (hello_pipe_stdin); | 62 | GNUNET_DISK_pipe_close (hello_pipe_stdin); |
@@ -196,7 +196,7 @@ check_kill () | |||
196 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); | 196 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); |
197 | } | 197 | } |
198 | GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (proc)); | 198 | GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (proc)); |
199 | GNUNET_OS_process_close (proc); | 199 | GNUNET_OS_process_destroy (proc); |
200 | proc = NULL; | 200 | proc = NULL; |
201 | GNUNET_DISK_pipe_close (hello_pipe_stdout); | 201 | GNUNET_DISK_pipe_close (hello_pipe_stdout); |
202 | GNUNET_DISK_pipe_close (hello_pipe_stdin); | 202 | GNUNET_DISK_pipe_close (hello_pipe_stdin); |
@@ -224,7 +224,7 @@ check_instant_kill () | |||
224 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); | 224 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); |
225 | } | 225 | } |
226 | GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (proc)); | 226 | GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (proc)); |
227 | GNUNET_OS_process_close (proc); | 227 | GNUNET_OS_process_destroy (proc); |
228 | proc = NULL; | 228 | proc = NULL; |
229 | GNUNET_DISK_pipe_close (hello_pipe_stdout); | 229 | GNUNET_DISK_pipe_close (hello_pipe_stdout); |
230 | GNUNET_DISK_pipe_close (hello_pipe_stdin); | 230 | GNUNET_DISK_pipe_close (hello_pipe_stdin); |
diff --git a/src/util/test_resolver_api.c b/src/util/test_resolver_api.c index fedbe8340..4a3a20375 100644 --- a/src/util/test_resolver_api.c +++ b/src/util/test_resolver_api.c | |||
@@ -384,7 +384,7 @@ check () | |||
384 | ok = 1; | 384 | ok = 1; |
385 | } | 385 | } |
386 | GNUNET_OS_process_wait (proc); | 386 | GNUNET_OS_process_wait (proc); |
387 | GNUNET_OS_process_close (proc); | 387 | GNUNET_OS_process_destroy (proc); |
388 | proc = NULL; | 388 | proc = NULL; |
389 | if (ok != 0) | 389 | if (ok != 0) |
390 | FPRINTF (stderr, "Missed some resolutions: %u\n", ok); | 390 | FPRINTF (stderr, "Missed some resolutions: %u\n", ok); |
diff --git a/src/vpn/test_gnunet_vpn.c b/src/vpn/test_gnunet_vpn.c index 52e2f3fa2..4c941bd92 100644 --- a/src/vpn/test_gnunet_vpn.c +++ b/src/vpn/test_gnunet_vpn.c | |||
@@ -462,7 +462,7 @@ stop_peer (struct PeerContext *p) | |||
462 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); | 462 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); |
463 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", | 463 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", |
464 | GNUNET_OS_process_get_pid (p->arm_proc)); | 464 | GNUNET_OS_process_get_pid (p->arm_proc)); |
465 | GNUNET_OS_process_close (p->arm_proc); | 465 | GNUNET_OS_process_destroy (p->arm_proc); |
466 | p->arm_proc = NULL; | 466 | p->arm_proc = NULL; |
467 | } | 467 | } |
468 | #endif | 468 | #endif |