From 62b342443ddf2e5089c9cbaf137dc6a81b0b4678 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Sat, 8 Apr 2017 20:02:53 -0700 Subject: Pull the error-reporting code for preference files into read_prefs(). No need to duplicate it in N different programs. Update comments while we're at it. Change-Id: I3096cbe5448a19363eff6303bdd54e522dae9336 Reviewed-on: https://code.wireshark.org/review/20973 Reviewed-by: Guy Harris --- ui/gtk/main.c | 33 +-------------------------------- 1 file changed, 1 insertion(+), 32 deletions(-) (limited to 'ui/gtk') diff --git a/ui/gtk/main.c b/ui/gtk/main.c index bfc3aac287..197610f769 100644 --- a/ui/gtk/main.c +++ b/ui/gtk/main.c @@ -1905,46 +1905,15 @@ get_wireshark_runtime_info(GString *str) static e_prefs * read_configuration_files(void) { - int gpf_open_errno, gpf_read_errno; int cf_open_errno, df_open_errno; - char *gpf_path, *pf_path; char *cf_path, *df_path; - int pf_open_errno, pf_read_errno; e_prefs *prefs_p; /* load the decode as entries of this profile */ load_decode_as_entries(); /* Read the preference files. */ - prefs_p = read_prefs(&gpf_open_errno, &gpf_read_errno, &gpf_path, - &pf_open_errno, &pf_read_errno, &pf_path); - - if (gpf_path != NULL) { - if (gpf_open_errno != 0) { - simple_dialog(ESD_TYPE_WARN, ESD_BTN_OK, - "Could not open global preferences file\n\"%s\": %s.", - gpf_path, g_strerror(gpf_open_errno)); - } - if (gpf_read_errno != 0) { - simple_dialog(ESD_TYPE_WARN, ESD_BTN_OK, - "I/O error reading global preferences file\n\"%s\": %s.", - gpf_path, g_strerror(gpf_read_errno)); - } - } - if (pf_path != NULL) { - if (pf_open_errno != 0) { - simple_dialog(ESD_TYPE_WARN, ESD_BTN_OK, - "Could not open your preferences file\n\"%s\": %s.", - pf_path, g_strerror(pf_open_errno)); - } - if (pf_read_errno != 0) { - simple_dialog(ESD_TYPE_WARN, ESD_BTN_OK, - "I/O error reading your preferences file\n\"%s\": %s.", - pf_path, g_strerror(pf_read_errno)); - } - g_free(pf_path); - pf_path = NULL; - } + prefs_p = read_prefs(); #ifdef _WIN32 /* if the user wants a console to be always there, well, we should open one for him */ -- cgit v1.2.3