diff options
| author | Gerald Combs <gerald@wireshark.org> | 2013-12-10 20:00:02 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2013-12-10 20:00:02 +0000 |
| commit | 61461ccc6ce33e1cda9e396d4440be70d0bd3e3f (patch) | |
| tree | 22f2f1388ccccfa24bf4a66f18d6753a3fdd4f79 | |
| parent | 9bdd3bbde1dbdfbeee75915d9ca7cc95233523e6 (diff) | |
Fix compilation on Windows.
svn path=/trunk/; revision=53912
| -rw-r--r-- | ui/decode_as_utils.c | 5 | ||||
| -rw-r--r-- | ui/decode_as_utils.h | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/ui/decode_as_utils.c b/ui/decode_as_utils.c index d78c5d8dde..8e3893c222 100644 --- a/ui/decode_as_utils.c +++ b/ui/decode_as_utils.c @@ -119,9 +119,12 @@ read_set_decode_as_entries(gchar *key, const gchar *value, sub_dissectors = find_dissector_table(values[0]); if (sub_dissectors != NULL) { lookup_entry_t lookup; + ftenum_t selector_type = dissector_table_get_type(sub_dissectors); + lookup.dissector_short_name = values[3]; lookup.handle = NULL; - ftenum_t selector_type = dissector_table_get_type(sub_dissectors); + selector_type = dissector_table_get_type(sub_dissectors); + g_slist_foreach(dissector_table_get_dissector_handles(sub_dissectors), change_dissector_if_matched, &lookup); if (lookup.handle != NULL || g_ascii_strcasecmp(values[3], DECODE_AS_NONE) == 0) { diff --git a/ui/decode_as_utils.h b/ui/decode_as_utils.h index de050c731f..fcb1884b0b 100644 --- a/ui/decode_as_utils.h +++ b/ui/decode_as_utils.h @@ -26,6 +26,8 @@ #ifndef __DECODE_AS_UTILS_H__ #define __DECODE_AS_UTILS_H__ +#include "ws_symbol_export.h" + /** @file * "Decode As" / "User Specified Decodes" dialog box. * @ingroup main_ui_group @@ -37,7 +39,7 @@ extern "C" { /** Reset the "decode as" entries and reload ones of the current profile. */ -WS_DLL_PUBLIC void load_decode_as_entries(void); +void load_decode_as_entries(void); /** This routine creates one entry in the list of protocol dissector * that need to be reset. It is called by the g_hash_table_foreach @@ -59,13 +61,13 @@ WS_DLL_PUBLIC void load_decode_as_entries(void); * * @param user_data Unused. */ -WS_DLL_PUBLIC void decode_build_reset_list (const gchar *table_name, ftenum_t selector_type, +void decode_build_reset_list (const gchar *table_name, ftenum_t selector_type, gpointer key, gpointer value _U_, gpointer user_data _U_); /** Clear all "decode as" settings. */ -WS_DLL_PUBLIC void decode_clear_all(void); +void decode_clear_all(void); /** Open the "decode_as_entries" configuration file and write its header. * |