diff options
author | jmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7> | 2004-03-04 08:20:46 +0000 |
---|---|---|
committer | jmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7> | 2004-03-04 08:20:46 +0000 |
commit | 9f9a98b6c25b948c1c273adc650dd0f5ca3fd2eb (patch) | |
tree | 08d07ad0562cd1a3d354eda17f200160f94f1f6f /mergecap.c | |
parent | ab69289d062f08ccb90fa3a91cffab68325784a0 (diff) |
Undo an unnecessary change
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@10297 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'mergecap.c')
-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 = ""; |