aboutsummaryrefslogtreecommitdiffstats
path: root/dftest.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2013-12-05 09:30:22 +0000
committerGuy Harris <guy@alum.mit.edu>2013-12-05 09:30:22 +0000
commit125a17f8e511efe36d14644715e37b438a87c6e0 (patch)
treeb4b4e8c36ecdb6867d3e4bb10c38b560970d50c4 /dftest.c
parent78c11720bbba1c682355482edfee99080c2cf54a (diff)
Initialize the error-reporting routines before scanning for plugins, as
the code to scan for them uses those routines. This means epan_init() no longer takes those routines as arguments - which is just as well, given that the mechanism in question is no longer part of libwireshark, but is part of libwsutil. This should fix bug 9508. svn path=/trunk/; revision=53796
Diffstat (limited to 'dftest.c')
-rw-r--r--dftest.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/dftest.c b/dftest.c
index d4f4cdf251..fe25681ff4 100644
--- a/dftest.c
+++ b/dftest.c
@@ -40,6 +40,7 @@
#include <wsutil/plugins.h>
#include <wsutil/filesystem.h>
#include <wsutil/privileges.h>
+#include <wsutil/report_err.h>
#include "ui/util.h"
#include "register.h"
@@ -74,6 +75,9 @@ main(int argc, char **argv)
init_progfile_dir_error);
}
+ init_report_err(failure_message, open_failure_message,
+ read_failure_message, write_failure_message);
+
timestamp_set_type(TS_RELATIVE);
timestamp_set_seconds_type(TS_SECONDS_DEFAULT);
@@ -81,10 +85,8 @@ main(int argc, char **argv)
"-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. */
- epan_init(register_all_protocols,
- register_all_protocol_handoffs, NULL, NULL,
- failure_message, open_failure_message, read_failure_message,
- write_failure_message);
+ epan_init(register_all_protocols, register_all_protocol_handoffs,
+ NULL, NULL);
/* set the c-language locale to the native environment. */
setlocale(LC_ALL, "");