aboutsummaryrefslogtreecommitdiffstats
path: root/capture_opts.c
diff options
context:
space:
mode:
authorwmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7>2007-01-01 16:58:03 +0000
committerwmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7>2007-01-01 16:58:03 +0000
commiteb67054b1649b634158542aa57ffab0cd91cb784 (patch)
tree6cd0329ce0b4d97fa88bd0c6afa2274020fff8aa /capture_opts.c
parent6697526d9569ed1d479b6538d6d489871acfd98b (diff)
From Pierre Juhen: patch to correct the bug 1220
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20254 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'capture_opts.c')
-rw-r--r--capture_opts.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/capture_opts.c b/capture_opts.c
index 49326c5b3d..37db6321df 100644
--- a/capture_opts.c
+++ b/capture_opts.c
@@ -584,6 +584,8 @@ static gboolean capture_opts_output_to_pipe(const char *save_file, gboolean *is_
{
int err;
+ *is_pipe = FALSE;
+
if (save_file != NULL) {
/* We're writing to a capture file. */
if (strcmp(save_file, "-") == 0) {
@@ -594,7 +596,7 @@ static gboolean capture_opts_output_to_pipe(const char *save_file, gboolean *is_
Least Astonishment. */
*is_pipe = TRUE;
} else {
- /* not a capture file, test for a FIFO (aka named pipe) */
+ /* not writing to stdout, test for a FIFO (aka named pipe) */
err = capture_opts_test_for_fifo(save_file);
switch (err) {
@@ -615,8 +617,6 @@ static gboolean capture_opts_output_to_pipe(const char *save_file, gboolean *is_
}
}
- *is_pipe = FALSE;
-
return 0;
}