From 2b0c584613bcc75c25f0491c4622fa9169196959 Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Sat, 7 Dec 2019 17:21:18 +0100 Subject: [PATCH] log: rearrange Signed-off-by: Christian Brauner --- src/lxc/log.h | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/src/lxc/log.h b/src/lxc/log.h index 951eaba31..553bc2a12 100644 --- a/src/lxc/log.h +++ b/src/lxc/log.h @@ -491,12 +491,6 @@ ATTR_UNUSED static inline void LXC_##LEVEL(struct lxc_log_locinfo* locinfo, \ -1; \ }) -#define log_trace(__ret__, format, ...) \ - ({ \ - TRACE(format, ##__VA_ARGS__); \ - __ret__; \ - }) - #define log_error_errno(__ret__, __errno__, format, ...) \ ({ \ errno = __errno__; \ @@ -510,6 +504,19 @@ ATTR_UNUSED static inline void LXC_##LEVEL(struct lxc_log_locinfo* locinfo, \ __ret__; \ }) +#define log_trace_errno(__ret__, __errno__, format, ...) \ + ({ \ + errno = __errno__; \ + SYSTRACE(format, ##__VA_ARGS__); \ + __ret__; \ + }) + +#define log_trace(__ret__, format, ...) \ + ({ \ + TRACE(format, ##__VA_ARGS__); \ + __ret__; \ + }) + #define log_warn_errno(__ret__, __errno__, format, ...) \ ({ \ errno = __errno__; \ @@ -517,18 +524,19 @@ ATTR_UNUSED static inline void LXC_##LEVEL(struct lxc_log_locinfo* locinfo, \ __ret__; \ }) -#define log_debug(__ret__, format, ...) \ - ({ \ - DEBUG(format, ##__VA_ARGS__); \ - __ret__; \ - }) - #define log_debug_errno(__ret__, __errno__, format, ...) \ ({ \ + errno = __errno__; \ SYSDEBUG(format, ##__VA_ARGS__); \ __ret__; \ }) +#define log_debug(__ret__, format, ...) \ + ({ \ + DEBUG(format, ##__VA_ARGS__); \ + __ret__; \ + }) + extern int lxc_log_fd; extern int lxc_log_syslog(int facility); -- 2.47.2