path: root/ui/decode_as_utils.h
diff options
authorMichael Mann <mmann78@netscape.net>2016-02-21 09:40:18 -0500
committerMichael Mann <mmann78@netscape.net>2016-02-21 18:25:01 +0000
commit14881e72d63d25048464155c5e8cc43a51731b16 (patch)
tree400db7f546ac16b9c41d9397d1bde87e59411c86 /ui/decode_as_utils.h
parent8889be17d0767c4f18f63f448e594f736305a560 (diff)
tshark: load decode_as_entries file
With Wireshark 2.0, some dissector preferences were removed in favor of 'Decode As' functionality. But the settings saved in the GUI are not loaded in tshark, preventing their use without an explicit call to '-d' option. Let's load decode_as_entries file by default and have it overridden by the '-d' option if required. Ping-Bug: 12124 Change-Id: I134a424cb6cf8fc89b7096a659ef1605314a70a2 Reviewed-on: https://code.wireshark.org/review/13956 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'ui/decode_as_utils.h')
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/decode_as_utils.h b/ui/decode_as_utils.h
index bc00881644..a8beadef9c 100644
--- a/ui/decode_as_utils.h
+++ b/ui/decode_as_utils.h
@@ -41,7 +41,7 @@ void load_decode_as_entries(void);
/** Write out the "decode as" entries of the current profile.
-void save_decode_as_entries(void);
+int save_decode_as_entries(gchar** err);
/** 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