diff options
| author | George Kadianakis <desnacked@riseup.net> | 2013-07-29 15:46:57 +0200 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-07-31 13:34:16 -0400 |
| commit | 2e7c531fdc63ed3d96180a10ea5d7d27989092a9 (patch) | |
| tree | 736aa106cc721f329240c380ffcbf4e310ddb5c6 /src/common | |
| parent | 6e408060251e5a8136bb06353fcd8083ff3e28fa (diff) | |
| download | tor-2e7c531fdc63ed3d96180a10ea5d7d27989092a9.tar.gz tor-2e7c531fdc63ed3d96180a10ea5d7d27989092a9.zip | |
Prepare some mock functions to test #9288.
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/util.c | 10 | ||||
| -rw-r--r-- | src/common/util.h | 21 |
2 files changed, 17 insertions, 14 deletions
diff --git a/src/common/util.c b/src/common/util.c index d9913dda45..a8867b691d 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -3969,9 +3969,9 @@ tor_spawn_background(const char *const filename, const char **argv, * <b>process_handle</b>. * If <b>also_terminate_process</b> is true, also terminate the * process of the process handle. */ -void -tor_process_handle_destroy(process_handle_t *process_handle, - int also_terminate_process) +MOCK_IMPL(void, +tor_process_handle_destroy,(process_handle_t *process_handle, + int also_terminate_process)) { if (!process_handle) return; @@ -4570,8 +4570,8 @@ log_from_handle(HANDLE *pipe, int severity) /** Return a smartlist containing lines outputted from * <b>handle</b>. Return NULL on error, and set * <b>stream_status_out</b> appropriately. */ -smartlist_t * -tor_get_lines_from_handle(FILE *handle, enum stream_status *stream_status_out) +MOCK_IMPL(smartlist_t *, +tor_get_lines_from_handle,(FILE *handle, enum stream_status *stream_status_out)) { enum stream_status stream_status; char stdout_buf[400]; diff --git a/src/common/util.h b/src/common/util.h index ad75266587..505ef23bd2 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -491,18 +491,21 @@ FILE *tor_process_get_stdout_pipe(process_handle_t *process_handle); #endif #ifdef _WIN32 -struct smartlist_t * -tor_get_lines_from_handle(HANDLE *handle, - enum stream_status *stream_status); +MOCK_DECL(struct smartlist_t *, +tor_get_lines_from_handle,(HANDLE *handle, + enum stream_status *stream_status)); #else -struct smartlist_t * -tor_get_lines_from_handle(FILE *handle, - enum stream_status *stream_status); +MOCK_DECL(struct smartlist_t *, +tor_get_lines_from_handle,(FILE *handle, + enum stream_status *stream_status)); #endif -int tor_terminate_process(process_handle_t *process_handle); -void tor_process_handle_destroy(process_handle_t *process_handle, - int also_terminate_process); +int +tor_terminate_process(process_handle_t *process_handle); + +MOCK_DECL(void, +tor_process_handle_destroy,(process_handle_t *process_handle, + int also_terminate_process)); /* ===== Insecure rng */ typedef struct tor_weak_rng_t { |