forked from osmocom/wireshark
All valid file types should have file type strings (and, currently, they
all do); get rid of the test for a null return from wtap_file_type_string().) If wtap_get_file_extensions_list() returns NULL, include the file type in the list of filters, and use "*.*" as the filter. That way the list of filters will include all file types, even if you can't really ask only for files of that type (actually, you can't really ask only for files of *any* type unless you're running under a desktop environment where file types are specified by, for example, looking for magic numbers, as there's no guarantee that, for example, a pcap file will have an extension at all, given that it might come from a command-line tool that doesn't default to any extension). svn path=/trunk/; revision=40650
This commit is contained in:
parent
c585d8de24
commit
340d882fba
|
@ -1471,12 +1471,17 @@ build_file_type_list(gboolean save, int *item_to_select) {
|
|||
}
|
||||
|
||||
/* OK, we can write it out in this type. */
|
||||
if(wtap_file_type_string(ft) == NULL)
|
||||
continue;
|
||||
extensions_list = wtap_get_file_extensions_list(ft);
|
||||
if (extensions_list == NULL)
|
||||
continue;
|
||||
|
||||
if (extensions_list == NULL) {
|
||||
/* This file type doesn't have any particular extension
|
||||
conventionally used for it, so we'll just use "*.*"
|
||||
as the pattern; on Windows, that matches all file names
|
||||
- even those with no extension - so we don't need to
|
||||
worry about compressed file extensions. (It does not
|
||||
do so on UN*X; the right pattern on UN*X would just
|
||||
be "*".) */
|
||||
g_string_printf(pattern_str, "*.*");
|
||||
} else {
|
||||
/* Construct the list of patterns. */
|
||||
g_string_printf(pattern_str, "");
|
||||
sep = '\0';
|
||||
|
@ -1487,6 +1492,7 @@ build_file_type_list(gboolean save, int *item_to_select) {
|
|||
g_string_append_printf(pattern_str, "*.%s", (char *)extension->data);
|
||||
sep = ';';
|
||||
}
|
||||
}
|
||||
|
||||
/* Construct the description. */
|
||||
g_string_printf(description_str, "%s (%s)", wtap_file_type_string(ft),
|
||||
|
|
Loading…
Reference in New Issue