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 --- epan/epan.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'epan/epan.c') diff --git a/epan/epan.c b/epan/epan.c index e4d6be73ef..b52244c921 100644 --- a/epan/epan.c +++ b/epan/epan.c @@ -41,7 +41,6 @@ #include "epan.h" #include "dfilter/dfilter.h" #include "epan_dissect.h" -#include "wsutil/report_err.h" #include "conversation.h" #include "circuit.h" @@ -94,15 +93,8 @@ void epan_init(void (*register_all_protocols_func)(register_cb cb, gpointer client_data), void (*register_all_handoffs_func)(register_cb cb, gpointer client_data), register_cb cb, - gpointer client_data, - void (*report_failure_fcn_p)(const char *, va_list), - void (*report_open_failure_fcn_p)(const char *, int, gboolean), - void (*report_read_failure_fcn_p)(const char *, int), - void (*report_write_failure_fcn_p)(const char *, int)) + gpointer client_data) { - init_report_err(report_failure_fcn_p, report_open_failure_fcn_p, - report_read_failure_fcn_p, report_write_failure_fcn_p); - /* initialize memory allocation subsystems */ emem_init(); wmem_init(); -- cgit v1.2.3