From 316b8d058951db64f3860455f64d02b690798db2 Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Mon, 4 Oct 2021 11:23:55 +0200 Subject: [PATCH] log: improve %m handling on musl Fixes: #3961 Signed-off-by: Christian Brauner --- src/lxc/log.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/lxc/log.h b/src/lxc/log.h index 2a6da40e9..6cee31886 100644 --- a/src/lxc/log.h +++ b/src/lxc/log.h @@ -391,7 +391,7 @@ __lxc_unused static inline void LXC_##LEVEL(struct lxc_log_locinfo* locinfo, \ LXC_FATAL(&locinfo, format, ##__VA_ARGS__); \ } while (0) -#if defined(__GNU_LIBRARY__) && !ENABLE_COVERITY_BUILD +#if (defined(__GNU_LIBRARY__) || defined(__MUSL__)) && !ENABLE_COVERITY_BUILD #define SYSTRACE(format, ...) \ TRACE("%m - " format, ##__VA_ARGS__) #else @@ -402,7 +402,7 @@ __lxc_unused static inline void LXC_##LEVEL(struct lxc_log_locinfo* locinfo, \ } while (0) #endif -#if defined(__GNU_LIBRARY__) && !ENABLE_COVERITY_BUILD +#if (defined(__GNU_LIBRARY__) || defined(__MUSL__)) && !ENABLE_COVERITY_BUILD #define SYSDEBUG(format, ...) \ DEBUG("%m - " format, ##__VA_ARGS__) #else @@ -414,7 +414,7 @@ __lxc_unused static inline void LXC_##LEVEL(struct lxc_log_locinfo* locinfo, \ #endif -#if defined(__GNU_LIBRARY__) && !ENABLE_COVERITY_BUILD +#if (defined(__GNU_LIBRARY__) || defined(__MUSL__)) && !ENABLE_COVERITY_BUILD #define SYSINFO(format, ...) \ INFO("%m - " format, ##__VA_ARGS__) #else @@ -425,7 +425,7 @@ __lxc_unused static inline void LXC_##LEVEL(struct lxc_log_locinfo* locinfo, \ } while (0) #endif -#if defined(__GNU_LIBRARY__) && !ENABLE_COVERITY_BUILD +#if (defined(__GNU_LIBRARY__) || defined(__MUSL__)) && !ENABLE_COVERITY_BUILD #define SYSNOTICE(format, ...) \ NOTICE("%m - " format, ##__VA_ARGS__) #else @@ -436,7 +436,7 @@ __lxc_unused static inline void LXC_##LEVEL(struct lxc_log_locinfo* locinfo, \ } while (0) #endif -#if defined(__GNU_LIBRARY__) && !ENABLE_COVERITY_BUILD +#if (defined(__GNU_LIBRARY__) || defined(__MUSL__)) && !ENABLE_COVERITY_BUILD #define SYSWARN(format, ...) \ WARN("%m - " format, ##__VA_ARGS__) #else @@ -447,7 +447,7 @@ __lxc_unused static inline void LXC_##LEVEL(struct lxc_log_locinfo* locinfo, \ } while (0) #endif -#if defined(__GNU_LIBRARY__) && !ENABLE_COVERITY_BUILD +#if (defined(__GNU_LIBRARY__) || defined(__MUSL__)) && !ENABLE_COVERITY_BUILD #define SYSERROR(format, ...) \ ERROR("%m - " format, ##__VA_ARGS__) #else @@ -458,7 +458,7 @@ __lxc_unused static inline void LXC_##LEVEL(struct lxc_log_locinfo* locinfo, \ } while (0) #endif -#if defined(__GNU_LIBRARY__) && !ENABLE_COVERITY_BUILD +#if (defined(__GNU_LIBRARY__) || defined(__MUSL__)) && !ENABLE_COVERITY_BUILD #define CMD_SYSERROR(format, ...) \ fprintf(stderr, "%s: %d: %s - %m - " format "\n", __FILE__, __LINE__, \ __func__, ##__VA_ARGS__); @@ -471,7 +471,7 @@ __lxc_unused static inline void LXC_##LEVEL(struct lxc_log_locinfo* locinfo, \ } while (0) #endif -#if defined(__GNU_LIBRARY__) && !ENABLE_COVERITY_BUILD +#if (defined(__GNU_LIBRARY__) || defined(__MUSL__)) && !ENABLE_COVERITY_BUILD #define CMD_SYSINFO(format, ...) \ printf("%s: %d: %s - %m - " format "\n", __FILE__, __LINE__, __func__, \ ##__VA_ARGS__); -- 2.47.2