From eeab433539d9fac198deebd0037cd52cc8d29689 Mon Sep 17 00:00:00 2001 From: Frediano Ziglio Date: Mon, 19 Jun 2017 09:03:36 +0100 Subject: [PATCH] log: Force format in log macro to be a string Make sure format is a string and not a pointer. This prevents usages like: spice_debug(NULL); This forbids computed format strings, but on the other hand, forcing the use of string constants allows the compiler to always check argument types against the format string. Moreover, there is no occurrences of computed format strings in the current codebase. Signed-off-by: Frediano Ziglio Acked-by: Christophe Fergeau --- common/log.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/common/log.h b/common/log.h index 9f5fcbb..06d48d2 100644 --- a/common/log.h +++ b/common/log.h @@ -62,23 +62,23 @@ void spice_log(GLogLevelFlags log_level, } G_STMT_END #define spice_info(format, ...) G_STMT_START { \ - spice_log(G_LOG_LEVEL_INFO, SPICE_STRLOC, __FUNCTION__, format, ## __VA_ARGS__); \ + spice_log(G_LOG_LEVEL_INFO, SPICE_STRLOC, __FUNCTION__, "" format, ## __VA_ARGS__); \ } G_STMT_END #define spice_debug(format, ...) G_STMT_START { \ - spice_log(G_LOG_LEVEL_DEBUG, SPICE_STRLOC, __FUNCTION__, format, ## __VA_ARGS__); \ + spice_log(G_LOG_LEVEL_DEBUG, SPICE_STRLOC, __FUNCTION__, "" format, ## __VA_ARGS__); \ } G_STMT_END #define spice_warning(format, ...) G_STMT_START { \ - spice_log(G_LOG_LEVEL_WARNING, SPICE_STRLOC, __FUNCTION__, format, ## __VA_ARGS__); \ + spice_log(G_LOG_LEVEL_WARNING, SPICE_STRLOC, __FUNCTION__, "" format, ## __VA_ARGS__); \ } G_STMT_END #define spice_critical(format, ...) G_STMT_START { \ - spice_log(G_LOG_LEVEL_CRITICAL, SPICE_STRLOC, __FUNCTION__, format, ## __VA_ARGS__); \ + spice_log(G_LOG_LEVEL_CRITICAL, SPICE_STRLOC, __FUNCTION__, "" format, ## __VA_ARGS__); \ } G_STMT_END #define spice_error(format, ...) G_STMT_START { \ - spice_log(G_LOG_LEVEL_ERROR, SPICE_STRLOC, __FUNCTION__, format, ## __VA_ARGS__); \ + spice_log(G_LOG_LEVEL_ERROR, SPICE_STRLOC, __FUNCTION__, "" format, ## __VA_ARGS__); \ } G_STMT_END #define spice_warn_if_fail(x) G_STMT_START { \