SCTP: plug the remaining memleaks in the tap

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

diff --git a/dftest.c b/dftest.c
index 7d7c868e9ca032115d50bb69924814c0dbe65c1a..e6e09b41e1945b604558de74024cf6663f213047 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,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,
@@ -58,9 +46,6 @@ main(int argc, char **argv)
 {
        char            *init_progfile_dir_error;
        char            *text;
-       char            *gpf_path, *pf_path;
-       int             gpf_open_errno, gpf_read_errno;
-       int             pf_open_errno, pf_read_errno;
        dfilter_t       *df;
        gchar           *err_msg;
 
@@ -73,7 +58,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);
@@ -87,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
@@ -109,32 +85,8 @@ main(int argc, char **argv)
        /* set the c-language locale to the native environment. */
        setlocale(LC_ALL, "");
 
-       read_prefs(&gpf_open_errno, &gpf_read_errno, &gpf_path,
-               &pf_open_errno, &pf_read_errno, &pf_path);
-       if (gpf_path != NULL) {
-               if (gpf_open_errno != 0) {
-                       fprintf(stderr,
-                               "can't open global preferences file \"%s\": %s.\n",
-                               pf_path, g_strerror(gpf_open_errno));
-               }
-               if (gpf_read_errno != 0) {
-                       fprintf(stderr,
-                               "I/O error reading global preferences file \"%s\": %s.\n",
-                               pf_path, g_strerror(gpf_read_errno));
-               }
-       }
-       if (pf_path != NULL) {
-               if (pf_open_errno != 0) {
-                       fprintf(stderr,
-                               "can't open your preferences file \"%s\": %s.\n",
-                               pf_path, g_strerror(pf_open_errno));
-               }
-               if (pf_read_errno != 0) {
-                       fprintf(stderr,
-                               "I/O error reading your preferences file \"%s\": %s.\n",
-                               pf_path, g_strerror(pf_read_errno));
-               }
-       }
+       /* Load libwireshark settings from the current profile. */
+       epan_load_settings();
 
        /* notify all registered modules that have had any of their preferences
        changed either from one of the preferences file or from the command