diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2004-03-04 08:20:46 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2004-03-04 08:20:46 +0000 |
| commit | de66318723566f2b0e0b8be7e2612d8f156fd7c1 (patch) | |
| tree | 08d07ad0562cd1a3d354eda17f200160f94f1f6f | |
| parent | 71866de15c2e92e28ee85aa5e1a09dbbd472b41d (diff) | |
| download | wireshark-de66318723566f2b0e0b8be7e2612d8f156fd7c1.tar.gz wireshark-de66318723566f2b0e0b8be7e2612d8f156fd7c1.tar.bz2 wireshark-de66318723566f2b0e0b8be7e2612d8f156fd7c1.zip | |
Undo an unnecessary change
svn path=/trunk/; revision=10297
| -rw-r--r-- | mergecap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mergecap.c b/mergecap.c index bc790659b6..6aebba7a88 100644 --- a/mergecap.c +++ b/mergecap.c @@ -1,6 +1,6 @@ /* Combine two dump files, either by appending or by merging by timestamp * - * $Id: mergecap.c,v 1.19 2004/03/03 22:14:10 jmayer Exp $ + * $Id: mergecap.c,v 1.20 2004/03/04 08:20:46 jmayer Exp $ * * Written by Scott Renfro <scott@renfro.org> based on * editcap by Richard Sharpe and Guy Harris @@ -266,7 +266,7 @@ open_outfile(out_file_t *out_file, int snapshot_len) } /* Allow output to stdout by using - */ - if ((strncmp(out_file->filename, "-", 2) == 0) && (strlen(out_file->filename) == 1)) + if (strncmp(out_file->filename, "-", 2) == 0) out_file->filename = ""; |