diff options
author | Guy Harris <guy@alum.mit.edu> | 2016-09-09 23:44:25 -0700 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2016-09-10 06:45:08 +0000 |
commit | 4a6dde12d6fe6af05b05d4c06b10056f6508711a (patch) | |
tree | 0ec3e0c7fb77dc645366d6f7f02a2b77ef886cd4 /ui/win32 | |
parent | d1cacbb1463503999981637314310a0824d9f3fe (diff) | |
download | wireshark-4a6dde12d6fe6af05b05d4c06b10056f6508711a.tar.gz |
Have "All Capture Files" match only capture files.
We support reading some types of files that aren't capture files, in
case we have a dissector for that file format (because, for example,
it's often transported over HTTP). Don't include them in the set of
files "All Capture Files" matches; you can still look for them as they
have individual entries in the drop-down menu of file type patterns.
Ultimately, there should be Fileshark/TFileshark programs to read those
files - and other file types, and even capture files if the goal is to
look at the file structure rather than at the packets - and *that's* the
program that should offer the ability to load JPEGs and so on.
(No, this does not reduce the "All Capture Files" list down to a level
that makes the problem in bug 12837 go away. The right way to fix
*that* is to arrange, somehow, that the "All Capture Files" entry not
actually list all the suffixes it matches.)
Change-Id: I705bff5fcd0694c6c6a11892621a195aa7cd0264
Reviewed-on: https://code.wireshark.org/review/17619
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'ui/win32')
-rw-r--r-- | ui/win32/file_dlg_win32.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/ui/win32/file_dlg_win32.c b/ui/win32/file_dlg_win32.c index ab4c92bfa7..7c25f16378 100644 --- a/ui/win32/file_dlg_win32.c +++ b/ui/win32/file_dlg_win32.c @@ -1488,19 +1488,18 @@ build_file_open_type_list(void) { sa = g_array_append_val(sa, zero); /* - * Add an "All Capture Files" entry, with all the extensions we - * know about. + * Add an "All Capture Files" entry, with all the capture file + * extensions we know about. */ str16 = utf_8to16("All Capture Files"); sa = g_array_append_vals(sa, str16, (guint) strlen("All Capture Files")); sa = g_array_append_val(sa, zero); /* - * Construct its list of patterns from a list of all extensions - * we support. + * Construct its list of patterns. */ pattern_str = g_string_new(""); - extensions_list = wtap_get_all_file_extensions_list(); + extensions_list = wtap_get_all_capture_file_extensions_list(); sep = '\0'; for (extension = extensions_list; extension != NULL; extension = g_slist_next(extension)) { |