diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2012-03-07 08:03:42 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2012-03-07 08:03:42 +0000 |
| commit | 1b25b08a0fbbfd3049cf57c5e9a2272d86759d52 (patch) | |
| tree | 976e7c05ec0d7da1dc4793da4b7702a941833888 /wiretap | |
| parent | a768f90aa7b521a255bbd4bd8233e772561afabe (diff) | |
From Martin Kaiser: correct sorting for wiretap's file type list
svn path=/trunk/; revision=41387
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/file_access.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/wiretap/file_access.c b/wiretap/file_access.c index 065a675254..51a92f0ff0 100644 --- a/wiretap/file_access.c +++ b/wiretap/file_access.c @@ -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); |