diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-08-11 12:16:23 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-08-11 19:16:48 +0000 |
| commit | 4309b964f548d0eb15c9ffbd78c8650fbb06a325 (patch) | |
| tree | eb15ae2b59eeb335b05d21026cbda26a0293905e /wiretap | |
| parent | de70d2a18a6d740df47ce764a81e195c158b2e51 (diff) | |
Sort dump_open_table_base[] in the right order.
As the comment says, "Entries must be sorted by
WTAP_FILE_TYPE_SUBTYPE_xxx values in ascending order." If they're not,
the file type to file type string routines don't give the right answer.
Change-Id: I06afe7bb98cb36c54ddc831113bb632598ab2eb0
Reviewed-on: https://code.wireshark.org/review/9975
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/file_access.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/wiretap/file_access.c b/wiretap/file_access.c index 09567ba715..a308c11e0c 100644 --- a/wiretap/file_access.c +++ b/wiretap/file_access.c @@ -1553,11 +1553,6 @@ static const struct file_type_subtype_info dump_open_table_base[] = { FALSE, FALSE, 0, logcat_dump_can_write_encap, logcat_binary_dump_open, NULL }, - /* WTAP_FILE_TYPE_SUBTYPE_JSON */ - { "JavaScript Object Notation", "json", "json", "NULL", - FALSE, FALSE, 0, - NULL, NULL, NULL }, - /* WTAP_FILE_TYPE_SUBTYPE_LOGCAT_BRIEF */ { "Android Logcat Brief text format", "logcat-brief", NULL, NULL, FALSE, FALSE, 0, @@ -1603,6 +1598,11 @@ static const struct file_type_subtype_info dump_open_table_base[] = { FALSE, FALSE, 0, NULL, NULL, NULL }, + /* WTAP_FILE_TYPE_SUBTYPE_JSON */ + { "JavaScript Object Notation", "json", "json", "NULL", + FALSE, FALSE, 0, + NULL, NULL, NULL }, + /* WTAP_FILE_TYPE_SUBTYPE_NETSCALER_3_5 */ { "NetScaler Trace (Version 3.5)", "nstrace35", "cap", NULL, TRUE, FALSE, 0, |