summaryrefslogtreecommitdiff
path: root/capture_sync.c
diff options
context:
space:
mode:
authorChris Maynard <Christopher.Maynard@GTECH.COM>2012-06-09 03:41:23 +0000
committerChris Maynard <Christopher.Maynard@GTECH.COM>2012-06-09 03:41:23 +0000
commite40c7ab1dcf863d230af94cf0bbb30335fe0d5eb (patch)
treed0664afb826f432d6bf85b0e99d5ed4ac9cfd1dd /capture_sync.c
parentc3dadc73f3d2f9682fb8f3b2850e661bfb0b98d7 (diff)
downloadwireshark-e40c7ab1dcf863d230af94cf0bbb30335fe0d5eb.tar.gz
Be sure to specify FORMAT_MESSAGE_IGNORE_INSERTS in the dwFlags arg to all FormatMessage() calls where FORMAT_MESSAGE_FROM_SYSTEM is also specified. (Ref: http://blogs.msdn.com/b/oldnewthing/archive/2007/11/28/6564257.aspx)
svn path=/trunk/; revision=43172
Diffstat (limited to 'capture_sync.c')
-rw-r--r--capture_sync.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/capture_sync.c b/capture_sync.c
index 366a566f82..2ae16fdf99 100644
--- a/capture_sync.c
+++ b/capture_sync.c
@@ -225,8 +225,8 @@ win32strerror(DWORD error)
size_t errlen;
char *p;
- FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, NULL, error, 0, errbuf,
- ERRBUF_SIZE, NULL);
+ FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
+ NULL, error, 0, errbuf, ERRBUF_SIZE, NULL);
/*
* "FormatMessage()" "helpfully" sticks CR/LF at the end of the
@@ -1637,7 +1637,7 @@ sync_pipe_input_cb(gint source, gpointer user_data)
"standard output", as the capture file. */
sync_pipe_stop(capture_opts);
capture_input_closed(capture_opts, NULL);
- return FALSE;
+ //return FALSE;
}
break;
case SP_PACKET_COUNT: