commit 6b3c3b968f9607e45fa18f91cedfc8fce8d0d8cc Author: George Kadianakis <desnacked@gmail.com> Date: Mon Oct 24 16:04:31 2011 +0200 Rename tor_process_destroy() to tor_process_handle_destroy(). --- src/common/util.c | 4 ++-- src/common/util.h | 4 ++-- src/or/transports.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 9df88eb..198a88b 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -3520,8 +3520,8 @@ tor_spawn_background(const char *const filename, const char **argv, * If <b>also_terminate_process</b> is true, also terminate the * process of the process handle. */ void -tor_process_destroy(process_handle_t *process_handle, - int also_terminate_process) +tor_process_handle_destroy(process_handle_t *process_handle, + int also_terminate_process) { if (also_terminate_process) { if (tor_terminate_process(process_handle) < 0) { diff --git a/src/common/util.h b/src/common/util.h index 9d3472a..0ff328f 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -420,8 +420,8 @@ char *tor_join_win_cmdline(const char *argv[]); int tor_process_get_pid(process_handle_t *process_handle); int tor_terminate_process(process_handle_t *process_handle); -void tor_process_destroy(process_handle_t *process_handle, - int also_terminate_process); +void tor_process_handle_destroy(process_handle_t *process_handle, + int also_terminate_process); #ifdef UTIL_PRIVATE /* Prototypes for private functions only used by util.c (and unit tests) */ diff --git a/src/or/transports.c b/src/or/transports.c index fc95a73..e60e98f 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -238,7 +238,7 @@ proxy_prepare_for_restart(managed_proxy_t *mp) tor_assert(mp->conf_state == PT_PROTO_COMPLETED); /* destroy the process handle and terminate the process. */ - tor_process_destroy(mp->process_handle, 1); + tor_process_handle_destroy(mp->process_handle, 1); /* create process handle for the upcoming new process. */ mp->process_handle = tor_malloc_zero(sizeof(process_handle_t)); @@ -545,7 +545,7 @@ managed_proxy_destroy(managed_proxy_t *mp, /* free the argv */ free_execve_args(mp->argv); - tor_process_destroy(mp->process_handle, also_terminate_process); + tor_process_handle_destroy(mp->process_handle, also_terminate_process); tor_free(mp); }