[tor-dev] [PATCH] Signed-off-by: Gisle <gvanem at broadpark.no>
Gisle
gvanem at broadpark.no
Tue May 31 21:44:30 UTC 2011
An elusive compile-error (MingW-gcc v4.50 on Win_XP); a missing
comma (!) and a typo ('err_msg' at line 277 changed to 'errmsg').
Aso changed the format for 'err_code' at line 293 into a "%ld" to suppress
a warning. How did this go unnoticed for ~1 month? Btw. This is my 1st ever
'git commit', so it better work.
---
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 8fcc1af..5c10e9a 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
--
1.7.0.2.msysgit.0
More information about the tor-dev
mailing list