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/transport | |
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/transport')
-rw-r--r-- | src/transport/gnunet-transport-certificate-creation.c | 4 | ||||
-rw-r--r-- | src/transport/gnunet-transport.c | 2 | ||||
-rw-r--r-- | src/transport/plugin_transport_http_server.c | 2 | ||||
-rw-r--r-- | src/transport/plugin_transport_wlan.c | 2 | ||||
-rw-r--r-- | src/transport/transport-testing.c | 4 |
5 files changed, 7 insertions, 7 deletions
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) |