From e3247b3a71f1bdb89c40573412ab7b2181212a98 Mon Sep 17 00:00:00 2001 From: Dario Lombardo Date: Mon, 12 Sep 2016 15:07:36 +0200 Subject: fix some compilation issues without extcap. Change-Id: I18c855e13281013a6277c1f38eeac92e74d52b34 Reviewed-on: https://code.wireshark.org/review/17665 Petri-Dish: Dario Lombardo Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- tshark.c | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'tshark.c') diff --git a/tshark.c b/tshark.c index 2e2ec5c76c..a009907357 100644 --- a/tshark.c +++ b/tshark.c @@ -1311,7 +1311,9 @@ main(int argc, char *argv[]) * $ ./tools/valgrind-wireshark -n * much more useful. */ epan_cleanup(); +#ifdef HAVE_EXTCAP extcap_cleanup(); +#endif return 0; case 'O': /* Only output these protocols */ /* already processed; just ignore it now */ @@ -1731,7 +1733,9 @@ main(int argc, char *argv[]) cmdarg_err("%s", err_msg); g_free(err_msg); epan_cleanup(); +#ifdef HAVE_EXTCAP extcap_cleanup(); +#endif #ifdef HAVE_PCAP_OPEN_DEAD { pcap_t *pc; @@ -1758,7 +1762,9 @@ main(int argc, char *argv[]) cmdarg_err("%s", err_msg); g_free(err_msg); epan_cleanup(); +#ifdef HAVE_EXTCAP extcap_cleanup(); +#endif #ifdef HAVE_PCAP_OPEN_DEAD { pcap_t *pc; @@ -1870,7 +1876,9 @@ main(int argc, char *argv[]) */ if (cf_open(&cfile, cf_name, in_file_type, FALSE, &err) != CF_OK) { epan_cleanup(); +#ifdef HAVE_EXTCAP extcap_cleanup(); +#endif return 2; } @@ -2032,7 +2040,9 @@ main(int argc, char *argv[]) funnel_dump_all_text_windows(); epan_free(cfile.epan); epan_cleanup(); +#ifdef HAVE_EXTCAP extcap_cleanup(); +#endif output_fields_free(output_fields); output_fields = NULL; -- cgit v1.2.3