TODO decrypt_krb5_data => proto_tree_add_expert_format cryptotvb TODO: decrypted_tvb

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

diff --git a/dftest.c b/dftest.c
index 73cdb6425ddaa69931c6c42b7cb449045eddf42d..d2c6857808faded874bffe90c5d231047f6dce30 100644 (file)
--- a/dftest.c
+++ b/dftest.c
@@ -5,19 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include <config.h>
@@ -45,7 +33,6 @@
 #include <wiretap/wtap.h>
 
 #include "ui/util.h"
-#include "register.h"
 
 static void failure_warning_message(const char *msg_format, va_list ap);
 static void open_failure_message(const char *filename, int err,
@@ -70,7 +57,7 @@ main(int argc, char **argv)
         * Attempt to get the pathname of the directory containing the
         * executable file.
         */
-       init_progfile_dir_error = init_progfile_dir(argv[0], main);
+       init_progfile_dir_error = init_progfile_dir(argv[0]);
        if (init_progfile_dir_error != NULL) {
                fprintf(stderr, "dftest: Can't get pathname of directory containing the dftest program: %s.\n",
                        init_progfile_dir_error);
@@ -84,23 +71,13 @@ 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
           by the dissectors, and we must do it before we read the preferences,
           in case any dissectors register preferences. */
-       if (!epan_init(register_all_protocols, register_all_protocol_handoffs,
-           NULL, NULL))
+       if (!epan_init(NULL, NULL, FALSE))
                return 2;
 
        /* set the c-language locale to the native environment. */