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>

1 files changed, 9 insertions, 10 deletions

diff --git a/ui/decode_as_utils.c b/ui/decode_as_utils.c
index 0d9788b36f..61a9dc174e 100644
--- a/ui/decode_as_utils.c
+++ b/ui/decode_as_utils.c
@@ -312,28 +312,26 @@ decode_as_write_entry (const gchar *table_name, ftenum_t selector_type,
     }
 }
 
-void
-save_decode_as_entries(void)
+int
+save_decode_as_entries(gchar** err)
 {
     char *pf_dir_path;
     char *daf_path;
     FILE *da_file;
 
     if (create_persconffile_dir(&pf_dir_path) == -1) {
-        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-                "Can't create directory\n\"%s\"\nfor recent file: %s.", pf_dir_path,
-                g_strerror(errno));
+        *err = g_strdup_printf("Can't create directory\n\"%s\"\nfor recent file: %s.",
+                                pf_dir_path, g_strerror(errno));
         g_free(pf_dir_path);
-        return;
+        return -1;
     }
 
     daf_path = get_persconffile_path(DECODE_AS_ENTRIES_FILE_NAME, TRUE);
     if ((da_file = ws_fopen(daf_path, "w")) == NULL) {
-        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-            "Can't open decode_as_entries file\n\"%s\": %s.", daf_path,
-            g_strerror(errno));
+        *err = g_strdup_printf("Can't open decode_as_entries file\n\"%s\": %s.",
+                                daf_path, g_strerror(errno));
         g_free(daf_path);
-        return;
+        return -1;
     }
 
     fputs("# \"Decode As\" entries file for Wireshark " VERSION ".\n"
@@ -344,6 +342,7 @@ save_decode_as_entries(void)
 
     dissector_all_tables_foreach_changed(decode_as_write_entry, da_file);
     fclose(da_file);
+    return 0;
 }
 
 /*