diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-03-26 19:05:20 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-03-27 02:06:28 +0000 |
| commit | f0ada20a91b2f8aeb785dfd121060af0442dd307 (patch) | |
| tree | 39d7e386b3c00d1e2b4372811c7c53d956a3fb05 /wsutil | |
| parent | 445a57bdc35f5f09ef878b6bf5a46d7018ddddcc (diff) | |
| download | wireshark-f0ada20a91b2f8aeb785dfd121060af0442dd307.tar.gz wireshark-f0ada20a91b2f8aeb785dfd121060af0442dd307.tar.bz2 wireshark-f0ada20a91b2f8aeb785dfd121060af0442dd307.zip | |
Make failure_alert_box() be printf-like.
Have it be printf-like, and have vfailure_alert_box() be vprintf-like.
Rename a few variables to make it clearer what pointers point to
vprintf-like functions.
Change-Id: I960e2138a18edcc742c450d68a0c6f7248f50c3f
Reviewed-on: https://code.wireshark.org/review/14646
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wsutil')
| -rw-r--r-- | wsutil/report_err.c | 8 | ||||
| -rw-r--r-- | wsutil/report_err.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/wsutil/report_err.c b/wsutil/report_err.c index 6b9fd13ae7..557b200c90 100644 --- a/wsutil/report_err.c +++ b/wsutil/report_err.c @@ -32,17 +32,17 @@ #include <glib.h> #include "report_err.h" -static void (*report_failure_func)(const char *, va_list); +static void (*vreport_failure_func)(const char *, va_list); static void (*report_open_failure_func)(const char *, int, gboolean); static void (*report_read_failure_func)(const char *, int); static void (*report_write_failure_func)(const char *, int); -void init_report_err(void (*report_failure_fcn_p)(const char *, va_list), +void init_report_err(void (*vreport_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)) { - report_failure_func = report_failure_fcn_p; + vreport_failure_func = vreport_failure_fcn_p; report_open_failure_func = report_open_failure_fcn_p; report_read_failure_func = report_read_failure_fcn_p; report_write_failure_func = report_write_failure_fcn_p; @@ -57,7 +57,7 @@ report_failure(const char *msg_format, ...) va_list ap; va_start(ap, msg_format); - (*report_failure_func)(msg_format, ap); + (*vreport_failure_func)(msg_format, ap); va_end(ap); } diff --git a/wsutil/report_err.h b/wsutil/report_err.h index ef781ca3ba..fcef2e2e4b 100644 --- a/wsutil/report_err.h +++ b/wsutil/report_err.h @@ -41,7 +41,7 @@ extern "C" { * Initialize the report err routines */ WS_DLL_PUBLIC void init_report_err( - void (*report_failure)(const char *, va_list), + void (*vreport_failure)(const char *, va_list), void (*report_open_failure)(const char *, int, gboolean), void (*report_read_failure)(const char *, int), void (*report_write_failure)(const char *, int)); |