From 83b8ddb7448228a50699460e67aef157431e6649 Mon Sep 17 00:00:00 2001 From: Gregor Jasny Date: Mon, 31 Oct 2022 19:07:04 +0100 Subject: [PATCH] Check and fix format string for turn_log_func_default (#1064) --- src/apps/common/apputils.c | 4 ++-- src/apps/common/ns_turn_utils.h | 6 +++++- src/apps/relay/mainrelay.c | 2 +- src/apps/uclient/mainuclient.c | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/apps/common/apputils.c b/src/apps/common/apputils.c index 6ef39f0..1a2ee43 100644 --- a/src/apps/common/apputils.c +++ b/src/apps/common/apputils.c @@ -1270,8 +1270,8 @@ unsigned long get_system_number_of_cpus(void) return sysInfo.dwNumberOfProcessors; #else #if defined(_SC_NPROCESSORS_ONLN) - TURN_LOG_FUNC(TURN_LOG_LEVEL_DEBUG, "System cpu num is %d \n", sysconf(_SC_NPROCESSORS_CONF)); - TURN_LOG_FUNC(TURN_LOG_LEVEL_DEBUG, "System enable num is %d\n", sysconf(_SC_NPROCESSORS_ONLN)); + TURN_LOG_FUNC(TURN_LOG_LEVEL_DEBUG, "System cpu num is %ld \n", sysconf(_SC_NPROCESSORS_CONF)); + TURN_LOG_FUNC(TURN_LOG_LEVEL_DEBUG, "System enable num is %ld\n", sysconf(_SC_NPROCESSORS_ONLN)); return sysconf(_SC_NPROCESSORS_CONF); #else //GNU way diff --git a/src/apps/common/ns_turn_utils.h b/src/apps/common/ns_turn_utils.h index 4f6a3f9..d40a283 100644 --- a/src/apps/common/ns_turn_utils.h +++ b/src/apps/common/ns_turn_utils.h @@ -71,7 +71,11 @@ void set_syslog_facility(char *val); void set_turn_log_timestamp_format(char* new_format); -void turn_log_func_default(char* file, int line, TURN_LOG_LEVEL level, const char* format, ...); +void turn_log_func_default(char* file, int line, TURN_LOG_LEVEL level, const char* format, ...) +#ifdef __GNUC__ +__attribute__ ((format (printf, 4, 5))) +#endif +; void addr_debug_print(int verbose, const ioa_addr *addr, const char* s); diff --git a/src/apps/relay/mainrelay.c b/src/apps/relay/mainrelay.c index 62d2d5d..9a87da7 100644 --- a/src/apps/relay/mainrelay.c +++ b/src/apps/relay/mainrelay.c @@ -2839,7 +2839,7 @@ int main(int argc, char **argv) int cpus = get_system_number_of_cpus(); if (0 < cpus) turn_params.cpus = get_system_number_of_cpus(); - TURN_LOG_FUNC(TURN_LOG_LEVEL_INFO, "System cpu num is %d\n", turn_params.cpus); + TURN_LOG_FUNC(TURN_LOG_LEVEL_INFO, "System cpu num is %lu\n", turn_params.cpus); if (turn_params.cpus < DEFAULT_CPUS_NUMBER) turn_params.cpus = DEFAULT_CPUS_NUMBER; else if (turn_params.cpus > MAX_NUMBER_OF_GENERAL_RELAY_SERVERS) diff --git a/src/apps/uclient/mainuclient.c b/src/apps/uclient/mainuclient.c index 6f54ee7..710afbe 100644 --- a/src/apps/uclient/mainuclient.c +++ b/src/apps/uclient/mainuclient.c @@ -576,7 +576,7 @@ int main(int argc, char **argv) { if (!SSL_CTX_load_verify_locations(root_tls_ctx[sslind], ca_cert_file, NULL )) { TURN_LOG_FUNC(TURN_LOG_LEVEL_ERROR, - "ERROR: cannot load CA from file\n", + "ERROR: cannot load CA from file: %s\n", ca_cert_file); exit(-1); }