diff options
| author | Guy Harris <guy@alum.mit.edu> | 2017-04-09 02:01:05 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2017-04-09 17:57:52 +0000 |
| commit | 7d5ce06cbe35f3f818695c87e5b0f42172ee3784 (patch) | |
| tree | b1819216afd831302cc94af54187122a2efdd4d8 /ui/gtk/main.c | |
| parent | 1abbb503e4242f56921b7ee950f185711e9f85c0 (diff) | |
| download | wireshark-7d5ce06cbe35f3f818695c87e5b0f42172ee3784.tar.gz | |
Pull the error reporting into {read,save}_filter_list.
Change-Id: I4d9582661f2f1728d400eeb2a1b1dea98f32ce7f
Reviewed-on: https://code.wireshark.org/review/20982
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'ui/gtk/main.c')
| -rw-r--r-- | ui/gtk/main.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/ui/gtk/main.c b/ui/gtk/main.c index 2e0d53a6f7..1516fbadce 100644 --- a/ui/gtk/main.c +++ b/ui/gtk/main.c @@ -1905,8 +1905,6 @@ get_wireshark_runtime_info(GString *str) static e_prefs * read_configuration_files(void) { - int cf_open_errno, df_open_errno; - char *cf_path, *df_path; e_prefs *prefs_p; /* load the decode as entries of this profile */ @@ -1923,22 +1921,10 @@ read_configuration_files(void) #endif /* Read the capture filter file. */ - read_filter_list(CFILTER_LIST, &cf_path, &cf_open_errno); - if (cf_path != NULL) { - simple_dialog(ESD_TYPE_WARN, ESD_BTN_OK, - "Could not open your capture filter file\n\"%s\": %s.", - cf_path, g_strerror(cf_open_errno)); - g_free(cf_path); - } + read_filter_list(CFILTER_LIST); /* Read the display filter file. */ - read_filter_list(DFILTER_LIST, &df_path, &df_open_errno); - if (df_path != NULL) { - simple_dialog(ESD_TYPE_WARN, ESD_BTN_OK, - "Could not open your display filter file\n\"%s\": %s.", - df_path, g_strerror(df_open_errno)); - g_free(df_path); - } + read_filter_list(DFILTER_LIST); /* * Read the files that enable and disable protocols and heuristic |