diff options
| author | Jaap Keuter <jaap.keuter@xs4all.nl> | 2018-12-07 00:24:29 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-12-07 06:00:14 +0000 |
| commit | a58904f387492b2f53816d4f10feb41b49fcc319 (patch) | |
| tree | 33ea522beb67e8010cbffa180e4c18bc6c24066e /mergecap.c | |
| parent | 0dfa4e825326a2573f4606b93da3a45d8a8a5e06 (diff) | |
PCAP/PCAPNG: Be consistent in documentation, etc
1) The default build configuration is to select PCAPNG as
output format, but it can be selected as PCAP. Some of the
command line tools have the option to select the output
format and default towards the build configuration.
This has to be reflected in their help output also.
2) Various documentation files are still stating that PCAP is
the default format of various tools. With the default build
configuration being PCAPNG these have to be adjusted as well.
(with lack of dynamic content the documentation can only refer
to the default build configuration format).
Change-Id: I51d19642a7ed8c99817971c1f25d20972095021e
Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-on: https://code.wireshark.org/review/30951
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'mergecap.c')
| -rw-r--r-- | mergecap.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mergecap.c b/mergecap.c index 172dcece3f..efd3e386b9 100644 --- a/mergecap.c +++ b/mergecap.c @@ -67,7 +67,11 @@ print_usage(FILE *output) fprintf(output, " default is to merge based on frame timestamps.\n"); fprintf(output, " -s <snaplen> truncate packets to <snaplen> bytes of data.\n"); fprintf(output, " -w <outfile>|- set the output filename to <outfile> or '-' for stdout.\n"); +#ifdef PCAP_NG_DEFAULT fprintf(output, " -F <capture type> set the output file type; default is pcapng.\n"); +#else + fprintf(output, " -F <capture type> set the output file type; default is pcap.\n"); +#endif fprintf(output, " an empty \"-F\" option will list the file types.\n"); fprintf(output, " -I <IDB merge mode> set the merge mode for Interface Description Blocks; default is 'all'.\n"); fprintf(output, " an empty \"-I\" option will list the merge modes.\n"); @@ -242,9 +246,9 @@ real_main(int argc, char *argv[]) int in_file_count = 0; guint32 snaplen = 0; #ifdef PCAP_NG_DEFAULT - int file_type = WTAP_FILE_TYPE_SUBTYPE_PCAPNG; /* default to pcap format */ + int file_type = WTAP_FILE_TYPE_SUBTYPE_PCAPNG; /* default to pcapng format */ #else - int file_type = WTAP_FILE_TYPE_SUBTYPE_PCAP; /* default to pcapng format */ + int file_type = WTAP_FILE_TYPE_SUBTYPE_PCAP; /* default to pcap format */ #endif int err = 0; gchar *err_info = NULL; |