diff options
| author | Bill Meier <wmeier@newsguy.com> | 2009-05-12 16:06:14 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2009-05-12 16:06:14 +0000 |
| commit | fa920e48ed72ab076c6c6a9b8e8264e1b05c1707 (patch) | |
| tree | d76a28588c8d0b601e67cd90e36426d5d55bfbff /mergecap.c | |
| parent | 3c0d24f3cbbb48a60c0e2b649c8a784ae3f96e7a (diff) | |
| download | wireshark-fa920e48ed72ab076c6c6a9b8e8264e1b05c1707.tar.gz | |
Minor cleanup of "-h" output text.
svn path=/trunk/; revision=28334
Diffstat (limited to 'mergecap.c')
| -rw-r--r-- | mergecap.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/mergecap.c b/mergecap.c index 5b0aa95235..89e9740804 100644 --- a/mergecap.c +++ b/mergecap.c @@ -95,22 +95,22 @@ usage(void) fprintf(stderr, "Merge two or more capture files into one.\n"); fprintf(stderr, "See http://www.wireshark.org for more information.\n"); fprintf(stderr, "\n"); - fprintf(stderr, "Usage: mergecap [options] -w <outfile|-> <infile> ...\n"); + fprintf(stderr, "Usage: mergecap [options] -w <outfile>|- <infile> ...\n"); fprintf(stderr, "\n"); fprintf(stderr, "Output:\n"); - fprintf(stderr, " -a files should be concatenated, not merged\n"); - fprintf(stderr, " Default merges based on frame timestamps\n"); - fprintf(stderr, " -s <snaplen> truncate packets to <snaplen> bytes of data\n"); - fprintf(stderr, " -w <outfile|-> set the output filename to <outfile> or '-' for stdout\n"); - fprintf(stderr, " -F <capture type> set the output file type, default is libpcap\n"); - fprintf(stderr, " an empty \"-F\" option will list the file types\n"); - fprintf(stderr, " -T <encap type> set the output file encapsulation type,\n"); - fprintf(stderr, " default is the same as the first input file\n"); - fprintf(stderr, " an empty \"-T\" option will list the encapsulation types\n"); + fprintf(stderr, " -a concatenate rather than merge files.\n"); + fprintf(stderr, " default is to merge based on frame timestamps.\n"); + fprintf(stderr, " -s <snaplen> truncate packets to <snaplen> bytes of data.\n"); + fprintf(stderr, " -w <outfile>|- set the output filename to <outfile> or '-' for stdout.\n"); + fprintf(stderr, " -F <capture type> set the output file type; default is libpcap.\n"); + fprintf(stderr, " an empty \"-F\" option will list the file types.\n"); + fprintf(stderr, " -T <encap type> set the output file encapsulation type;\n"); + fprintf(stderr, " default is the same as the first input file.\n"); + fprintf(stderr, " an empty \"-T\" option will list the encapsulation types.\n"); fprintf(stderr, "\n"); fprintf(stderr, "Miscellaneous:\n"); - fprintf(stderr, " -h display this help and exit\n"); - fprintf(stderr, " -v verbose output\n"); + fprintf(stderr, " -h display this help and exit.\n"); + fprintf(stderr, " -v verbose output.\n"); } static void list_capture_types(void) { |