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 /sharkd.c | |
parent | 1abbb503e4242f56921b7ee950f185711e9f85c0 (diff) |
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 'sharkd.c')
-rw-r--r-- | sharkd.c | 9 |
1 files changed, 1 insertions, 8 deletions
@@ -122,9 +122,7 @@ main(int argc, char *argv[]) GString *runtime_info_str; char *init_progfile_dir_error; - char *cf_path; char *err_msg = NULL; - int cf_open_errno; e_prefs *prefs_p; int ret = EXIT_SUCCESS; @@ -208,12 +206,7 @@ main(int argc, char *argv[]) prefs_p = read_prefs(); - read_filter_list(CFILTER_LIST, &cf_path, &cf_open_errno); - if (cf_path != NULL) { - cmdarg_err("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); if (!color_filters_init(&err_msg, NULL)) { fprintf(stderr, "color_filters_init() failed %s\n", err_msg); |