diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-06-01 11:11:31 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-06-01 11:11:31 -0400 |
| commit | b73a662a2697dcfe0ee06737cedd2130bdd29129 (patch) | |
| tree | ee35c7d57b3e3259b2d56fbcf0d45a2138af3ebb /src/common | |
| parent | a610ebc3a6990261f1cd4ac7c498a3fe8a6c1a53 (diff) | |
| parent | 1d8bcba067ef8d96ebe022f06459d55c308343ec (diff) | |
| download | tor-b73a662a2697dcfe0ee06737cedd2130bdd29129.tar.gz tor-b73a662a2697dcfe0ee06737cedd2130bdd29129.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/procmon.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/common/procmon.c b/src/common/procmon.c index 8fcc1afb7c..5c10e9a22b 100644 --- a/src/common/procmon.c +++ b/src/common/procmon.c @@ -252,7 +252,7 @@ tor_process_monitor_poll_cb(evutil_socket_t unused1, short unused2, if (!GetExitCodeProcess(procmon->hproc, &exit_code)) { char *errmsg = format_win32_error(GetLastError()); log_warn(procmon->log_domain, "Error \"%s\" occurred while polling " - "handle for monitored process %d; assuming it's dead." + "handle for monitored process %d; assuming it's dead.", errmsg, procmon->pid); tor_free(errmsg); its_dead_jim = 1; @@ -287,12 +287,12 @@ tor_process_monitor_poll_cb(evutil_socket_t unused1, short unused2, if (!its_dead_jim) log_info(procmon->log_domain, "Failed to open handle to monitored " - "process %d, and error code %d (%s) is not 'invalid " + "process %d, and error code %lu (%s) is not 'invalid " "parameter' -- assuming the process is still alive.", procmon->pid, - err_code, err_msg); + err_code, errmsg); - tor_free(err_msg); + tor_free(errmsg); } } #else |