osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

From Martin Kaiser: correct sorting for wiretap's file type list 

svn path=/trunk/; revision=41387
This commit is contained in:
Anders Broman 2012-03-07 08:03:42 +00:00
parent a768f90aa7
commit 1b25b08a0f
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wiretap/file_access.c
View File

@ -405,7 +405,8 @@ success:
return wth;
}
/* Table of the file types we know about. */
/* Table of the file types we know about.
Entries must be sorted by WTAP_FILE_xxx values in ascending order */
static const struct file_type_info dump_open_table_base[] = {
/* WTAP_FILE_UNKNOWN (only used internally for initialization) */
{ NULL, NULL, NULL, NULL, FALSE, FALSE,
@ -588,7 +589,7 @@ static const struct file_type_info dump_open_table_base[] = {
{ "WildPackets Ether/Token/AiroPeek (V7)", "peek7", "pkt", "tpc;apc;wpz", FALSE, FALSE,
NULL, NULL },
/* WTAP_FILE_ETHERPEEK_V9 */
/* WTAP_FILE_AIROPEEK_V9 */
{ "WildPackets Ether/AiroPeek (V9)", "peek9", "pkt", "tpc;apc;wpz", FALSE, FALSE,
NULL, NULL },
@ -596,10 +597,6 @@ static const struct file_type_info dump_open_table_base[] = {
{ "MPEG", "mpeg", "mpeg", "mpg;mp3", FALSE, FALSE,
NULL, NULL },
/* WTAP_FILE_MPEG_2_TS */
{ "MP2T", "mp2t", "mp2t", "ts;mpg", FALSE, FALSE,
NULL, NULL },
/* WTAP_FILE_K12TEXT */
{ "K12 text file", "k12text", "txt", NULL, FALSE, FALSE,
k12text_dump_can_write_encap, k12text_dump_open },
@ -655,6 +652,11 @@ static const struct file_type_info dump_open_table_base[] = {
/* WTAP_FILE_AETHRA */
{ "Aethra .aps file", "aethra", "aps", NULL, FALSE, FALSE,
NULL, NULL },
/* WTAP_FILE_MPEG_2_TS */
{ "MPEG2 transport stream", "mp2t", "mp2t", "ts;mpg", FALSE, FALSE,
NULL, NULL }
};
gint wtap_num_file_types = sizeof(dump_open_table_base) / sizeof(struct file_type_info);