replace SPDX identifier GPL-2.0+ with GPL-2.0-or-later.

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

diff --git a/dftest.c b/dftest.c
index 36abd0330305f5be4ba6de7cab7c86d7a98b687f..24e6002c1462ec271bace2934c39a2d1590e7269 100644 (file)
--- a/dftest.c
+++ b/dftest.c
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include <config.h>
@@ -33,7 +33,7 @@
 #include <wiretap/wtap.h>
 
 #include "ui/util.h"
-#include "register.h"
+#include "epan/register.h"
 
 static void failure_warning_message(const char *msg_format, va_list ap);
 static void open_failure_message(const char *filename, int err,
@@ -72,16 +72,7 @@ main(int argc, char **argv)
        timestamp_set_type(TS_RELATIVE);
        timestamp_set_seconds_type(TS_SECONDS_DEFAULT);
 
-#ifdef HAVE_PLUGINS
-       /* Register all the plugin types we have. */
-       epan_register_plugin_types(); /* Types known to libwireshark */
-
-       /* Scan for plugins.  This does *not* call their registration routines;
-          that's done later. */
-       scan_plugins(REPORT_LOAD_FAILURE);
-#endif
-
-       wtap_init();
+       wtap_init(TRUE);
 
        /* Register all dissectors; we must do this before checking for the
           "-g" flag, as the "-g" flag dumps a list of fields registered