diff options
author | Guy Harris <guy@alum.mit.edu> | 2004-06-30 07:04:42 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2004-06-30 07:04:42 +0000 |
commit | 99cec606fa7efa9d9ee61cbc0f6fa99b39417e72 (patch) | |
tree | 27293e9f0aa7496e630cb613fced32eeef968971 /mergecap.c | |
parent | 272a2055ab3114ba4a114f8ceb48be1d58933028 (diff) |
Initialize "out_filename" to NULL, so it's set to NULL if it's not set
by a "-w" flag.
svn path=/trunk/; revision=11277
Diffstat (limited to 'mergecap.c')
-rw-r--r-- | mergecap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mergecap.c b/mergecap.c index aa31504dcd..74527020b7 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.23 2004/06/30 06:58:57 guy Exp $ + * $Id: mergecap.c,v 1.24 2004/06/30 07:04:42 guy Exp $ * * Written by Scott Renfro <scott@renfro.org> based on * editcap by Richard Sharpe and Guy Harris @@ -94,7 +94,7 @@ main(int argc, char *argv[]) merge_in_file_t *in_files = NULL; merge_out_file_t out_file; int err; - char *out_filename; + char *out_filename = NULL; /* initialize out_file */ out_file.fd = 0; @@ -111,7 +111,7 @@ main(int argc, char *argv[]) switch (opt) { case 'w': - out_filename = optarg; + out_filename = optarg; break; case 'a': |