This is an automated email from the ASF dual-hosted git repository. jdanek pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/qpid-proton.git
commit 99e0d1f7277b50ffb061f3dfac773afa042a23dc Author: Jiri Daněk <[email protected]> AuthorDate: Sat Oct 14 16:37:43 2023 +0200 PROTON-2772: add printf format arg annotations to satisfy MSVC --- c/src/core/connection_driver.c | 4 ++-- c/src/core/engine.c | 2 +- c/src/core/error.c | 2 +- c/src/core/log.c | 2 +- c/src/core/logger.c | 6 +++--- c/src/core/object/string.c | 4 ++-- c/src/core/transport.c | 4 ++-- c/src/sasl/sasl.c | 2 +- c/src/ssl/schannel.cpp | 9 ++++++--- c/tools/msgr-common.c | 2 +- 10 files changed, 20 insertions(+), 17 deletions(-) diff --git a/c/src/core/connection_driver.c b/c/src/core/connection_driver.c index 534389f60..883665bde 100644 --- a/c/src/core/connection_driver.c +++ b/c/src/core/connection_driver.c @@ -157,7 +157,7 @@ void pn_connection_driver_verrorf(pn_connection_driver_t *d, const char *name, c pn_condition_vformat(cond, name, fmt, ap); } -void pn_connection_driver_errorf(pn_connection_driver_t *d, const char *name, const char *fmt, ...) { +void pn_connection_driver_errorf(pn_connection_driver_t *d, const char *name, PN_PRINTF_FORMAT const char *fmt, ...) { va_list ap; va_start(ap, fmt); pn_connection_driver_verrorf(d, name, fmt, ap); @@ -168,7 +168,7 @@ void pn_connection_driver_log(pn_connection_driver_t *d, const char *msg) { pni_logger_log(&d->transport->logger, PN_SUBSYSTEM_IO, PN_LEVEL_TRACE, msg); } -void pn_connection_driver_logf(pn_connection_driver_t *d, const char *fmt, ...) { +void pn_connection_driver_logf(pn_connection_driver_t *d, PN_PRINTF_FORMAT const char *fmt, ...) { va_list ap; va_start(ap, fmt); pni_logger_vlogf(&d->transport->logger, PN_SUBSYSTEM_IO, PN_LEVEL_TRACE, fmt, ap); diff --git a/c/src/core/engine.c b/c/src/core/engine.c index 02c41299b..8110a85e5 100644 --- a/c/src/core/engine.c +++ b/c/src/core/engine.c @@ -2215,7 +2215,7 @@ int pn_condition_vformat(pn_condition_t *condition, const char *name, const char return err; } -int pn_condition_format(pn_condition_t *condition, const char *name, const char *fmt, ...) +int pn_condition_format(pn_condition_t *condition, const char *name, PN_PRINTF_FORMAT const char *fmt, ...) { assert(condition); va_list ap; diff --git a/c/src/core/error.c b/c/src/core/error.c index c4b5c0497..9b1a3b6e7 100644 --- a/c/src/core/error.c +++ b/c/src/core/error.c @@ -90,7 +90,7 @@ int pn_error_vformat(pn_error_t *error, int code, const char *fmt, va_list ap) return pn_error_set(error, code, text); } -int pn_error_format(pn_error_t *error, int code, const char *fmt, ...) +int pn_error_format(pn_error_t *error, int code, PN_PRINTF_FORMAT const char *fmt, ...) { assert(error); va_list ap; diff --git a/c/src/core/log.c b/c/src/core/log.c index 6ee83c53c..49c333ef1 100644 --- a/c/src/core/log.c +++ b/c/src/core/log.c @@ -55,7 +55,7 @@ void pni_vlogf_impl(const char *fmt, va_list ap) { * complicated messages.) It is important that a disabled log statement results * in nothing more than a call to pni_log_enabled(). */ -void pni_logf_impl(const char *fmt, ...) { +void pni_logf_impl(PN_PRINTF_FORMAT const char *fmt, ...) { va_list ap; va_start(ap, fmt); pni_vlogf_impl(fmt, ap); diff --git a/c/src/core/logger.c b/c/src/core/logger.c index ad5310a6c..492c6c341 100644 --- a/c/src/core/logger.c +++ b/c/src/core/logger.c @@ -222,7 +222,7 @@ void pni_logger_log_raw(pn_logger_t *logger, pn_log_subsystem_t subsystem, pn_lo } } -void pni_logger_log_msg_inspect(pn_logger_t *logger, pn_log_subsystem_t subsystem, pn_log_level_t severity, void* object, const char *fmt, ...) { +void pni_logger_log_msg_inspect(pn_logger_t *logger, pn_log_subsystem_t subsystem, pn_log_level_t severity, void* object, PN_PRINTF_FORMAT const char *fmt, ...) { va_list ap; char buf[1024]; pn_fixed_string_t out = pn_fixed_string(buf, sizeof(buf)); @@ -236,7 +236,7 @@ void pni_logger_log_msg_inspect(pn_logger_t *logger, pn_log_subsystem_t subsyste pni_logger_log(logger, subsystem, severity, buf); } -void pni_logger_log_msg_frame(pn_logger_t *logger, pn_log_subsystem_t subsystem, pn_log_level_t severity, pn_bytes_t frame, const char *fmt, ...) { +void pni_logger_log_msg_frame(pn_logger_t *logger, pn_log_subsystem_t subsystem, pn_log_level_t severity, pn_bytes_t frame, PN_PRINTF_FORMAT const char *fmt, ...) { va_list ap; char buf[1024]; pn_fixed_string_t output = pn_fixed_string(buf, sizeof(buf)); @@ -283,7 +283,7 @@ void pni_logger_vlogf(pn_logger_t *logger, pn_log_subsystem_t subsystem, pn_log_ pni_logger_log(logger, subsystem, severity, buf); } -void pn_logger_logf(pn_logger_t *logger, pn_log_subsystem_t subsystem, pn_log_level_t severity, const char *fmt, ...) +void pn_logger_logf(pn_logger_t *logger, pn_log_subsystem_t subsystem, pn_log_level_t severity, PN_PRINTF_FORMAT const char *fmt, ...) { va_list ap; diff --git a/c/src/core/object/string.c b/c/src/core/object/string.c index 6c8adbe14..eeb297c15 100644 --- a/c/src/core/object/string.c +++ b/c/src/core/object/string.c @@ -204,7 +204,7 @@ void pn_string_clear(pn_string_t *string) pn_string_set(string, NULL); } -int pn_string_format(pn_string_t *string, const char *format, ...) +int pn_string_format(pn_string_t *string, PN_PRINTF_FORMAT const char *format, ...) { va_list ap; @@ -220,7 +220,7 @@ int pn_string_vformat(pn_string_t *string, const char *format, va_list ap) return pn_string_vaddf(string, format, ap); } -int pn_string_addf(pn_string_t *string, const char *format, ...) +int pn_string_addf(pn_string_t *string, PN_PRINTF_FORMAT const char *format, ...) { va_list ap; diff --git a/c/src/core/transport.c b/c/src/core/transport.c index 260e894c9..1536f4274 100644 --- a/c/src/core/transport.c +++ b/c/src/core/transport.c @@ -993,7 +993,7 @@ static void pni_close_tail(pn_transport_t *transport) } } -int pn_do_error(pn_transport_t *transport, const char *condition, const char *fmt, ...) +int pn_do_error(pn_transport_t *transport, const char *condition, PN_PRINTF_FORMAT const char *fmt, ...) { va_list ap; va_start(ap, fmt); @@ -2840,7 +2840,7 @@ void pn_transport_vlogf(pn_transport_t *transport, const char *fmt, va_list ap) pni_logger_vlogf(logger, PN_SUBSYSTEM_ALL, PN_LEVEL_TRACE, fmt, ap); } -void pn_transport_logf(pn_transport_t *transport, const char *fmt, ...) +void pn_transport_logf(pn_transport_t *transport, PN_PRINTF_FORMAT const char *fmt, ...) { va_list ap; diff --git a/c/src/sasl/sasl.c b/c/src/sasl/sasl.c index b58045737..6469ae672 100644 --- a/c/src/sasl/sasl.c +++ b/c/src/sasl/sasl.c @@ -49,7 +49,7 @@ static const char pni_excluded_mechs[] = "GSSAPI GSS-SPNEGO GS2-KRB5 GS2-IAKERB" //----------------------------------------------------------------------------- // pnx_sasl: API for SASL implementations to use -void pnx_sasl_logf(pn_transport_t *logger, pn_log_level_t level, const char *fmt, ...) +void pnx_sasl_logf(pn_transport_t *logger, pn_log_level_t level, PN_PRINTF_FORMAT const char *fmt, ...) { va_list ap; va_start(ap, fmt); diff --git a/c/src/ssl/schannel.cpp b/c/src/ssl/schannel.cpp index c289d91fd..b2e1cefb1 100644 --- a/c/src/ssl/schannel.cpp +++ b/c/src/ssl/schannel.cpp @@ -374,7 +374,8 @@ static void ssl_vlog(pn_transport_t *transport, pn_log_level_t sev, const char * } } -static void ssl_log(pn_transport_t *transport, pn_log_level_t sev, const char *fmt, ...) +PN_PRINTF_FORMAT_ATTR(3, 4) +static void ssl_log(pn_transport_t *transport, pn_log_level_t sev, PN_PRINTF_FORMAT const char *fmt, ...) { va_list ap; va_start(ap, fmt); @@ -383,7 +384,8 @@ static void ssl_log(pn_transport_t *transport, pn_log_level_t sev, const char *f } // @todo: used to avoid littering the code with calls to printf... -static void ssl_log_error(const char *fmt, ...) +PN_PRINTF_FORMAT_ATTR(1, 2) +static void ssl_log_error(PN_PRINTF_FORMAT const char *fmt, ...) { va_list ap; va_start(ap, fmt); @@ -391,7 +393,8 @@ static void ssl_log_error(const char *fmt, ...) va_end(ap); } -static void ssl_log_error_status(HRESULT status, const char *fmt, ...) +PN_PRINTF_FORMAT_ATTR(2, 3) +static void ssl_log_error_status(HRESULT status, PN_PRINTF_FORMAT const char *fmt, ...) { char buf[512]; va_list ap; diff --git a/c/tools/msgr-common.c b/c/tools/msgr-common.c index 92dd491b2..45fd1d330 100644 --- a/c/tools/msgr-common.c +++ b/c/tools/msgr-common.c @@ -164,7 +164,7 @@ void enable_logging(void) dolog = 1; } -void LOG( const char *fmt, ... ) +void LOG( PN_PRINTF_FORMAT const char *fmt, ... ) { if (dolog) { va_list ap; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
