From 125a17f8e511efe36d14644715e37b438a87c6e0 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Thu, 5 Dec 2013 09:30:22 +0000 Subject: 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 --- dftest.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'dftest.c') diff --git a/dftest.c b/dftest.c index d4f4cdf251..fe25681ff4 100644 --- a/dftest.c +++ b/dftest.c @@ -40,6 +40,7 @@ #include #include #include +#include #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, ""); -- cgit v1.2.3