path: root/rawshark.c
diff options
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 /rawshark.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 'rawshark.c')
1 files changed, 5 insertions, 3 deletions
diff --git a/rawshark.c b/rawshark.c
index 7dd8b793d3..6623639849 100644
--- a/rawshark.c
+++ b/rawshark.c
@@ -71,6 +71,7 @@
#include <wsutil/file_util.h>
#include <wsutil/filesystem.h>
#include <wsutil/plugins.h>
+#include <wsutil/report_err.h>
#include "globals.h"
#include <epan/packet.h>
@@ -538,6 +539,9 @@ main(int argc, char *argv[])
log_func_ignore, NULL /* user_data */);
+ init_report_err(failure_message, open_failure_message, read_failure_message,
+ write_failure_message);
@@ -546,9 +550,7 @@ main(int argc, char *argv[])
"-G" flag, as the "-G" flag dumps information 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, "");