From a58904f387492b2f53816d4f10feb41b49fcc319 Mon Sep 17 00:00:00 2001 From: Jaap Keuter Date: Fri, 7 Dec 2018 00:24:29 +0100 Subject: 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 Reviewed-on: https://code.wireshark.org/review/30951 Petri-Dish: Anders Broman Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- tshark.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'tshark.c') diff --git a/tshark.c b/tshark.c index a07def734e..9ee2180199 100644 --- a/tshark.c +++ b/tshark.c @@ -386,10 +386,18 @@ print_usage(FILE *output) /*fprintf(output, "\n");*/ fprintf(output, "Output:\n"); +#ifdef PCAP_NG_DEFAULT + fprintf(output, " -w write packets to a pcapng-format file named \"outfile\"\n"); +#else fprintf(output, " -w write packets to a pcap-format file named \"outfile\"\n"); +#endif fprintf(output, " (or to the standard output for \"-\")\n"); fprintf(output, " -C start with specified configuration profile\n"); +#ifdef PCAP_NG_DEFAULT fprintf(output, " -F set the output file type, default is pcapng\n"); +#else + fprintf(output, " -F set the output file type, default is pcap\n"); +#endif fprintf(output, " an empty \"-F\" option will list the file types\n"); fprintf(output, " -V add output of packet tree (Packet Details)\n"); fprintf(output, " -O Only show packet details of these protocols, comma\n"); -- cgit v1.2.3