From 2ff25b75674d0df2d7e2f6e66f3d1e1be5c02606 Mon Sep 17 00:00:00 2001 From: Christophe Fergeau Date: Thu, 26 Nov 2015 17:52:38 +0100 Subject: log: Remove unneeded #ifdef/#endif If header guards are working as expected, there should not be multiple definitions of these macros. If they are redefined somewhere else, this is a bug we want to fix. Acked-by: Frediano Ziglio Acked-by: Jonathon Jongsma --- common/log.h | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/common/log.h b/common/log.h index 1c54b0f..38a7988 100644 --- a/common/log.h +++ b/common/log.h @@ -54,96 +54,70 @@ void spice_log(const char *log_domain, const char *format, ...) SPICE_ATTR_PRINTF(5, 6); -#ifndef spice_return_if_fail #define spice_return_if_fail(x) G_STMT_START { \ if G_LIKELY(x) { } else { \ spice_log(SPICE_LOG_DOMAIN, SPICE_LOG_LEVEL_CRITICAL, SPICE_STRLOC, G_STRFUNC, "condition `%s' failed", #x); \ return; \ } \ } G_STMT_END -#endif -#ifndef spice_return_val_if_fail #define spice_return_val_if_fail(x, val) G_STMT_START { \ if G_LIKELY(x) { } else { \ spice_log(SPICE_LOG_DOMAIN, SPICE_LOG_LEVEL_CRITICAL, SPICE_STRLOC, __FUNCTION__, "condition `%s' failed", #x); \ return (val); \ } \ } G_STMT_END -#endif -#ifndef spice_warn_if_reached #define spice_warn_if_reached() G_STMT_START { \ spice_log(SPICE_LOG_DOMAIN, SPICE_LOG_LEVEL_WARNING, SPICE_STRLOC, __FUNCTION__, "should not be reached"); \ } G_STMT_END -#endif -#ifndef spice_printerr #define spice_printerr(format, ...) G_STMT_START { \ fprintf(stderr, "%s: " format "\n", __FUNCTION__, ## __VA_ARGS__); \ } G_STMT_END -#endif -#ifndef spice_info #define spice_info(format, ...) G_STMT_START { \ spice_log(SPICE_LOG_DOMAIN, SPICE_LOG_LEVEL_INFO, SPICE_STRLOC, __FUNCTION__, format, ## __VA_ARGS__); \ } G_STMT_END -#endif -#ifndef spice_debug #define spice_debug(format, ...) G_STMT_START { \ spice_log(SPICE_LOG_DOMAIN, SPICE_LOG_LEVEL_DEBUG, SPICE_STRLOC, __FUNCTION__, format, ## __VA_ARGS__); \ } G_STMT_END -#endif -#ifndef spice_warning #define spice_warning(format, ...) G_STMT_START { \ spice_log(SPICE_LOG_DOMAIN, SPICE_LOG_LEVEL_WARNING, SPICE_STRLOC, __FUNCTION__, format, ## __VA_ARGS__); \ } G_STMT_END -#endif -#ifndef spice_critical #define spice_critical(format, ...) G_STMT_START { \ spice_log(SPICE_LOG_DOMAIN, SPICE_LOG_LEVEL_CRITICAL, SPICE_STRLOC, __FUNCTION__, format, ## __VA_ARGS__); \ } G_STMT_END -#endif -#ifndef spice_error #define spice_error(format, ...) G_STMT_START { \ spice_log(SPICE_LOG_DOMAIN, SPICE_LOG_LEVEL_ERROR, SPICE_STRLOC, __FUNCTION__, format, ## __VA_ARGS__); \ } G_STMT_END -#endif -#ifndef spice_warn_if_fail #define spice_warn_if_fail(x) G_STMT_START { \ if G_LIKELY(x) { } else { \ spice_warning("condition `%s' failed", #x); \ } \ } G_STMT_END -#endif -#ifndef spice_warn_if #define spice_warn_if(x) G_STMT_START { \ if G_UNLIKELY(x) { \ spice_warning("condition `%s' reached", #x); \ } \ } G_STMT_END -#endif -#ifndef spice_assert #define spice_assert(x) G_STMT_START { \ if G_LIKELY(x) { } else { \ spice_error("assertion `%s' failed", #x); \ } \ } G_STMT_END -#endif /* FIXME: improve that some day.. */ -#ifndef spice_static_assert #define spice_static_assert(x) SPICE_STMT_START { \ spice_assert(x); \ } SPICE_STMT_END -#endif SPICE_END_DECLS -- cgit v1.2.3