diff options
| author | Guy Harris <guy@alum.mit.edu> | 2017-04-08 20:02:53 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2017-04-09 03:03:25 +0000 |
| commit | 62b342443ddf2e5089c9cbaf137dc6a81b0b4678 (patch) | |
| tree | 1b56e22c014c8293165f0a9f2061f70e2ba39e4d /dftest.c | |
| parent | f0a24bee898d71c7c005d68b97d47b16f7778f1c (diff) | |
| download | wireshark-62b342443ddf2e5089c9cbaf137dc6a81b0b4678.tar.gz | |
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 <guy@alum.mit.edu>
Diffstat (limited to 'dftest.c')
| -rw-r--r-- | dftest.c | 30 |
1 files changed, 1 insertions, 29 deletions
@@ -58,9 +58,6 @@ main(int argc, char **argv) { char *init_progfile_dir_error; char *text; - char *gpf_path, *pf_path; - int gpf_open_errno, gpf_read_errno; - int pf_open_errno, pf_read_errno; dfilter_t *df; gchar *err_msg; @@ -109,32 +106,7 @@ main(int argc, char **argv) /* set the c-language locale to the native environment. */ setlocale(LC_ALL, ""); - 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) { - fprintf(stderr, - "can't open global preferences file \"%s\": %s.\n", - pf_path, g_strerror(gpf_open_errno)); - } - if (gpf_read_errno != 0) { - fprintf(stderr, - "I/O error reading global preferences file \"%s\": %s.\n", - pf_path, g_strerror(gpf_read_errno)); - } - } - if (pf_path != NULL) { - if (pf_open_errno != 0) { - fprintf(stderr, - "can't open your preferences file \"%s\": %s.\n", - pf_path, g_strerror(pf_open_errno)); - } - if (pf_read_errno != 0) { - fprintf(stderr, - "I/O error reading your preferences file \"%s\": %s.\n", - pf_path, g_strerror(pf_read_errno)); - } - } + read_prefs(); /* notify all registered modules that have had any of their preferences changed either from one of the preferences file or from the command |