diff options
| author | Guy Harris <guy@alum.mit.edu> | 2013-12-05 09:30:22 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2013-12-05 09:30:22 +0000 |
| commit | 125a17f8e511efe36d14644715e37b438a87c6e0 (patch) | |
| tree | b4b4e8c36ecdb6867d3e4bb10c38b560970d50c4 /epan/epan.c | |
| parent | 78c11720bbba1c682355482edfee99080c2cf54a (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 'epan/epan.c')
| -rw-r--r-- | epan/epan.c | 10 |
1 files changed, 1 insertions, 9 deletions
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(); |