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 /mergecap.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 'mergecap.c')
| -rw-r--r-- | mergecap.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/mergecap.c b/mergecap.c index 0dfcf5295b..6e8414dd20 100644 --- a/mergecap.c +++ b/mergecap.c @@ -64,11 +64,7 @@ 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"); @@ -240,11 +236,7 @@ main(int argc, char *argv[]) gboolean verbose = FALSE; int in_file_count = 0; guint32 snaplen = 0; -#ifdef PCAP_NG_DEFAULT int file_type = WTAP_FILE_TYPE_SUBTYPE_PCAPNG; /* default to pcapng format */ -#else - int file_type = WTAP_FILE_TYPE_SUBTYPE_PCAP; /* default to pcap format */ -#endif int err = 0; gchar *err_info = NULL; int err_fileno; |