diff options
| author | George Kadianakis <desnacked@riseup.net> | 2012-08-21 20:56:30 +0300 |
|---|---|---|
| committer | George Kadianakis <desnacked@riseup.net> | 2012-09-05 18:23:29 +0300 |
| commit | b9551fd0741434e9d0917355d67164775eb25fbe (patch) | |
| tree | 291054f841776c08cc5140b3f54d8c74acdb0623 /src/common/util.c | |
| parent | 44fe717524408d247ab10e3794438232d81d66dc (diff) | |
| download | tor-b9551fd0741434e9d0917355d67164775eb25fbe.tar.gz tor-b9551fd0741434e9d0917355d67164775eb25fbe.zip | |
Fix some bugs that did not allow compilation on Windows.
Diffstat (limited to 'src/common/util.c')
| -rw-r--r-- | src/common/util.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/common/util.c b/src/common/util.c index 25ddcc1fb3..fa8fb5386f 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -4381,17 +4381,17 @@ tor_get_lines_from_handle(HANDLE *handle, char stdout_buf[600] = {0}; smartlist_t *lines = NULL; - tor_assert(stream_status); + tor_assert(stream_status_out); - *stream_status = IO_STREAM_TERM; + *stream_status_out = IO_STREAM_TERM; pos = tor_read_all_handle(handle, stdout_buf, sizeof(stdout_buf) - 1, NULL); if (pos < 0) { - *stream_status = IO_STREAM_TERM; + *stream_status_out = IO_STREAM_TERM; return NULL; } if (pos == 0) { - *stream_status = IO_STREAM_EAGAIN; + *stream_status_out = IO_STREAM_EAGAIN; return NULL; } @@ -4408,7 +4408,7 @@ tor_get_lines_from_handle(HANDLE *handle, SMARTLIST_FOREACH(lines, char *, line, SMARTLIST_REPLACE_CURRENT(lines, line, tor_strdup(line))); - *stream_status = IO_STREAM_OKAY; + *stream_status_out = IO_STREAM_OKAY; return lines; } @@ -4461,8 +4461,8 @@ log_from_handle(HANDLE *pipe, int severity) #else /** Return a smartlist containing lines outputted from - * <b>handle</b>. Return NULL on error, and set <b>stream_status</b> - * appropriately. */ + * <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) { |