WiX: Disable desktop icon and shortcut checkboxes.

[metze/wireshark/wip.git] / tshark.c

diff --git a/tshark.c b/tshark.c
index 452e420bb3dab537c20a32a3a049b78121bddbbc..a0099073574292c43fefff1f05ca338e22aa8acb 100644 (file)
--- a/tshark.c
+++ b/tshark.c
@@ -122,6 +122,10 @@
 #include <wsutil/str_util.h>
 #include <wsutil/utf8_entities.h>
 
+#ifdef HAVE_EXTCAP
+#include "extcap.h"
+#endif
+
 #ifdef HAVE_PLUGINS
 #include <wsutil/plugins.h>
 #endif
@@ -787,7 +791,7 @@ main(int argc, char *argv[])
 
   /* Scan for plugins.  This does *not* call their registration routines;
      that's done later. */
-  scan_plugins();
+  scan_plugins(REPORT_LOAD_FAILURE);
 
   /* Register all libwiretap plugin modules. */
   register_all_wiretap_modules();
@@ -1307,6 +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 */
@@ -1726,6 +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;
@@ -1752,6 +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;
@@ -1863,6 +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;
     }
 
@@ -2024,6 +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;