diff options
Diffstat (limited to 'mergecap.c')
| -rw-r--r-- | mergecap.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/mergecap.c b/mergecap.c index 50362186d0..daddbda1fb 100644 --- a/mergecap.c +++ b/mergecap.c @@ -55,7 +55,7 @@ #include <wsutil/plugins.h> #endif -#include <wsutil/report_err.h> +#include <wsutil/report_message.h> #include <wiretap/merge.h> @@ -129,10 +129,11 @@ string_elem_print(gpointer data, gpointer not_used _U_) #ifdef HAVE_PLUGINS /* - * General errors are reported with an console message in mergecap. + * General errors and warnings are reported with an console message + * in mergecap. */ static void -failure_message(const char *msg_format, va_list ap) +failure_warning_message(const char *msg_format, va_list ap) { fprintf(stderr, "mergecap: "); vfprintf(stderr, msg_format, ap); @@ -310,7 +311,8 @@ main(int argc, char *argv[]) wtap_init(); #ifdef HAVE_PLUGINS - init_report_err(failure_message,NULL,NULL,NULL); + init_report_message(failure_warning_message, failure_warning_message, + NULL, NULL, NULL); /* Scan for plugins. This does *not* call their registration routines; that's done later. |