diff options
| author | Bill Meier <wmeier@newsguy.com> | 2007-01-01 16:58:03 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2007-01-01 16:58:03 +0000 |
| commit | 38a246630f3d595d75f90603e8d577a59a06ea54 (patch) | |
| tree | 6cd0329ce0b4d97fa88bd0c6afa2274020fff8aa /capture_opts.c | |
| parent | 224a21ecfe5e0a1ede7d524e99b948012cf1802b (diff) | |
| download | wireshark-38a246630f3d595d75f90603e8d577a59a06ea54.tar.gz wireshark-38a246630f3d595d75f90603e8d577a59a06ea54.tar.bz2 wireshark-38a246630f3d595d75f90603e8d577a59a06ea54.zip | |
From Pierre Juhen: patch to correct the bug 1220
svn path=/trunk/; revision=20254
Diffstat (limited to 'capture_opts.c')
| -rw-r--r-- | capture_opts.c | 6 |
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; } |