summaryrefslogtreecommitdiff
path: root/tshark.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2017-04-09 02:01:05 -0700
committerGuy Harris <guy@alum.mit.edu>2017-04-09 17:57:52 +0000
commit7d5ce06cbe35f3f818695c87e5b0f42172ee3784 (patch)
treeb1819216afd831302cc94af54187122a2efdd4d8 /tshark.c
parent1abbb503e4242f56921b7ee950f185711e9f85c0 (diff)
downloadwireshark-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 'tshark.c')
-rw-r--r--tshark.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/tshark.c b/tshark.c
index 19af646675..6a7e345507 100644
--- a/tshark.c
+++ b/tshark.c
@@ -665,8 +665,6 @@ main(int argc, char *argv[])
WSADATA wsaData;
#endif /* _WIN32 */
- char *cf_path;
- int cf_open_errno;
int err;
volatile int exit_status = EXIT_SUCCESS;
#ifdef HAVE_LIBPCAP
@@ -1009,12 +1007,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);
/*
* Read the files that enable and disable protocols and heuristic