diff options
Diffstat (limited to 'mergecap.c')
| -rw-r--r-- | mergecap.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/mergecap.c b/mergecap.c index c6c97619ef..089ef0254d 100644 --- a/mergecap.c +++ b/mergecap.c @@ -129,14 +129,14 @@ string_elem_print(gpointer data, gpointer not_used _U_) #ifdef HAVE_PLUGINS /* - * Don't report failures to load plugins because most (non-wiretap) plugins - * *should* fail to load (because we're not linked against libwireshark and - * dissector plugins need libwireshark). + * General errors are reported with an console message in mergecap. */ static void -failure_message(const char *msg_format _U_, va_list ap _U_) +failure_message(const char *msg_format, va_list ap) { - return; + fprintf(stderr, "mergecap: "); + vfprintf(stderr, msg_format, ap); + fprintf(stderr, "\n"); } #endif @@ -310,8 +310,12 @@ main(int argc, char *argv[]) init_report_err(failure_message,NULL,NULL,NULL); /* Scan for plugins. This does *not* call their registration routines; - that's done later. */ - scan_plugins(); + that's done later. + + Don't report failures to load plugins because most (non-wiretap) + plugins *should* fail to load (because we're not linked against + libwireshark and dissector plugins need libwireshark).*/ + scan_plugins(DONT_REPORT_LOAD_FAILURE); /* Register all libwiretap plugin modules. */ register_all_wiretap_modules(); |