diff options
| author | Guy Harris <guy@alum.mit.edu> | 2012-01-14 09:12:05 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2012-01-14 09:12:05 +0000 |
| commit | eb5c7d64a4bf6b55fd7878aae59ececa1a3506d4 (patch) | |
| tree | f7a1b2e6e987d1f7c68bd5e167f7cb7ac00f992e /wiretap/file_access.c | |
| parent | 37ffde4018bafc7ff052bf318100c85baaa6a662 (diff) | |
| download | wireshark-eb5c7d64a4bf6b55fd7878aae59ececa1a3506d4.tar.gz | |
Get rid of unused WTAP_FILE_WTAP file type.
Move pcap-NG right after standard pcap in the list of file types, so
that it shows up early in the list of output file types in the "Save
As..." dialog box (if, that is, it's supported; if not, neither is pcap,
as they use the same link-layer header type values).
svn path=/trunk/; revision=40493
Diffstat (limited to 'wiretap/file_access.c')
| -rw-r--r-- | wiretap/file_access.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/wiretap/file_access.c b/wiretap/file_access.c index 5ba7d685e5..58d508887a 100644 --- 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 }, |