log: rearrange

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

diff --git a/src/lxc/log.h b/src/lxc/log.h
index 951eaba318b176e41e4ec4f281d1df817e4ed76d..553bc2a1201b33fdbfc76eac8062b20d45345f57 100644 (file)
--- 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);