aboutsummaryrefslogtreecommitdiffstats
path: root/tfshark.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2017-04-08 20:02:53 -0700
committerGuy Harris <guy@alum.mit.edu>2017-04-09 03:03:25 +0000
commit62b342443ddf2e5089c9cbaf137dc6a81b0b4678 (patch)
tree1b56e22c014c8293165f0a9f2061f70e2ba39e4d /tfshark.c
parentf0a24bee898d71c7c005d68b97d47b16f7778f1c (diff)
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 'tfshark.c')
-rw-r--r--tfshark.c31
1 files changed, 2 insertions, 29 deletions
diff --git a/tfshark.c b/tfshark.c
index 0993b61..e72645a 100644
--- a/tfshark.c
+++ b/tfshark.c
@@ -334,9 +334,6 @@ main(int argc, char *argv[])
};
gboolean arg_error = FALSE;
- char *gpf_path, *pf_path;
- int gpf_open_errno, gpf_read_errno;
- int pf_open_errno, pf_read_errno;
int err;
volatile int exit_status = 0;
gboolean quiet = FALSE;
@@ -560,8 +557,7 @@ main(int argc, char *argv[])
if (strcmp(argv[2], "column-formats") == 0)
column_dump_column_formats();
else if (strcmp(argv[2], "currentprefs") == 0) {
- read_prefs(&gpf_open_errno, &gpf_read_errno, &gpf_path,
- &pf_open_errno, &pf_read_errno, &pf_path);
+ read_prefs();
write_prefs(NULL);
}
else if (strcmp(argv[2], "decodes") == 0)
@@ -601,30 +597,7 @@ main(int argc, char *argv[])
goto clean_exit;
}
- 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) {
- cmdarg_err("Can't open global preferences file \"%s\": %s.",
- pf_path, g_strerror(gpf_open_errno));
- }
- if (gpf_read_errno != 0) {
- cmdarg_err("I/O error reading global preferences file \"%s\": %s.",
- pf_path, g_strerror(gpf_read_errno));
- }
- }
- if (pf_path != NULL) {
- if (pf_open_errno != 0) {
- cmdarg_err("Can't open your preferences file \"%s\": %s.", pf_path,
- g_strerror(pf_open_errno));
- }
- if (pf_read_errno != 0) {
- cmdarg_err("I/O error reading your preferences file \"%s\": %s.",
- pf_path, g_strerror(pf_read_errno));
- }
- g_free(pf_path);
- pf_path = NULL;
- }
+ prefs_p = read_prefs();
/*
* Read the files that enable and disable protocols and heuristic