diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2020-04-06 00:16:34 +0200 |
|---|---|---|
| committer | Guy Harris <gharris@sonic.net> | 2020-04-06 01:29:37 +0000 |
| commit | ef717da61a7a12023d89dc9891dee540b156da69 (patch) | |
| tree | a3af6c706f45bfa7a79d7e3b3d9fdd4295f5154f /tshark.c | |
| parent | 55d3d322394488b5b62d5c4445ed8f6fa071f09a (diff) | |
CMake: remove ENABLE_PCAP_NG_DEFAULT option
pcapng has been the compile-time default since 2011. If there are any
users who would like to use the libpcap format, then they should use
runtime options instead (e.g. `tshark -P` or `editcap -F pcap`).
Change-Id: I54b70368cdc3ca78bc8617bc488cc687740a1eb9
Reviewed-on: https://code.wireshark.org/review/36721
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <gharris@sonic.net>
Diffstat (limited to 'tshark.c')
| -rw-r--r-- | tshark.c | 12 |
1 files changed, 0 insertions, 12 deletions
@@ -414,20 +414,12 @@ print_usage(FILE *output) /*fprintf(output, "\n");*/ fprintf(output, "Output:\n"); -#ifdef PCAP_NG_DEFAULT fprintf(output, " -w <outfile|-> write packets to a pcapng-format file named \"outfile\"\n"); -#else - fprintf(output, " -w <outfile|-> write packets to a pcap-format file named \"outfile\"\n"); -#endif fprintf(output, " (or '-' for stdout)\n"); fprintf(output, " --capture-comment <comment>\n"); fprintf(output, " set the capture file comment, if supported\n"); fprintf(output, " -C <config profile> start with specified configuration profile\n"); -#ifdef PCAP_NG_DEFAULT fprintf(output, " -F <output file type> set the output file type, default is pcapng\n"); -#else - fprintf(output, " -F <output file 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, " -V add output of packet tree (Packet Details)\n"); fprintf(output, " -O <protocols> Only show packet details of these protocols, comma\n"); @@ -733,11 +725,7 @@ main(int argc, char *argv[]) volatile int max_packet_count = 0; #endif gboolean quiet = FALSE; -#ifdef PCAP_NG_DEFAULT volatile int out_file_type = WTAP_FILE_TYPE_SUBTYPE_PCAPNG; -#else - volatile int out_file_type = WTAP_FILE_TYPE_SUBTYPE_PCAP; -#endif volatile gboolean out_file_name_res = FALSE; volatile int in_file_type = WTAP_TYPE_AUTO; gchar *volatile cf_name = NULL; |