Get rid of unused WTAP_FILE_WTAP file type.

[obnox/wireshark/wip.git] / wiretap / file_access.c

diff --git a/wiretap/file_access.c b/wiretap/file_access.c
index 5ba7d685e514b27bceadc09cea106e794d991b97..58d508887ac838477042e31f38d61c8dbe7574e2 100644 (file)
--- a/wiretap/file_access.c
+++ b/wiretap/file_access.c
@@ -409,15 +409,15 @@ static const struct file_type_info dump_open_table_base[] = {
        { NULL, NULL, NULL, NULL, FALSE, FALSE,
          NULL, NULL },
 
-       /* WTAP_FILE_WTAP (only used internally while capturing) */
-       { NULL, NULL, NULL, NULL, FALSE, FALSE,
-         NULL, NULL },
-
        /* WTAP_FILE_PCAP */
         /* Gianluca Varenni suggests that we add "deprecated" to the description. */
        { "Wireshark/tcpdump/... - libpcap", "libpcap", "*.pcap;*.cap", ".pcap", FALSE, FALSE,
          libpcap_dump_can_write_encap, libpcap_dump_open },
 
+       /* WTAP_FILE_PCAPNG */
+       { "Wireshark - pcapng", "pcapng", "*.pcapng", NULL, FALSE, TRUE,
+         pcapng_dump_can_write_encap, pcapng_dump_open },
+
        /* WTAP_FILE_PCAP_NSEC */
        { "Wireshark - nanosecond libpcap", "nseclibpcap", "*.pcap;*.cap", ".pcap", FALSE, FALSE,
          libpcap_dump_can_write_encap, libpcap_dump_open },
@@ -606,10 +606,6 @@ static const struct file_type_info dump_open_table_base[] = {
        { "TamoSoft CommView", "commview", "*.ncf", ".ncf", FALSE, FALSE,
          commview_dump_can_write_encap, commview_dump_open },
 
-       /* WTAP_FILE_PCAPNG */
-       { "Wireshark - pcapng", "pcapng", "*.pcapng", NULL, FALSE, TRUE,
-         pcapng_dump_can_write_encap, pcapng_dump_open },
-
        /* WTAP_FILE_BTSNOOP */
        { "Symbian OS btsnoop", "btsnoop", "*.log", ".log", FALSE, FALSE,
          btsnoop_dump_can_write_encap, btsnoop_dump_open_h4 },