log: mark logging helpers to use

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

diff --git a/src/lxc/log.h b/src/lxc/log.h
index 9452e63f2325170536959a3771ee1c01f57ade21..e8ffb664e0a47474c00fb45581e161d300e6d54c 100644 (file)
--- a/src/lxc/log.h
+++ b/src/lxc/log.h
@@ -523,41 +523,6 @@ __lxc_unused static inline void LXC_##LEVEL(struct lxc_log_locinfo* locinfo,       \
                __internal_ret__;                             \
        })
 
-#define syserror(format, ...)                    \
-       ({                                       \
-               SYSERROR(format, ##__VA_ARGS__); \
-               (-errno);                        \
-       })
-
-#define syserror_set(__ret__, format, ...)                    \
-       ({                                                    \
-               typeof(__ret__) __internal_ret__ = (__ret__); \
-               errno = labs(__ret__);                        \
-               SYSERROR(format, ##__VA_ARGS__);              \
-               __internal_ret__;                             \
-       })
-
-#define syserror_ret(__ret__, format, ...)                    \
-       ({                                                    \
-               typeof(__ret__) __internal_ret__ = (__ret__); \
-               SYSERROR(format, ##__VA_ARGS__);              \
-               __internal_ret__;                             \
-       })
-
-#define sysdebug(format, ...)                    \
-       ({                                       \
-               SYSDEBUG(format, ##__VA_ARGS__); \
-               (-errno);                        \
-       })
-
-#define sysdebug_set(__ret__, format, ...)                    \
-       ({                                                    \
-               typeof(__ret__) __internal_ret__ = (__ret__); \
-               errno = labs(__ret__);                        \
-               SYSDEBUG(format, ##__VA_ARGS__);              \
-               __internal_ret__;                             \
-       })
-
 #define log_error(__ret__, format, ...)                       \
        ({                                                    \
                typeof(__ret__) __internal_ret__ = (__ret__); \
@@ -625,6 +590,49 @@ __lxc_unused static inline void LXC_##LEVEL(struct lxc_log_locinfo* locinfo,       \
                __internal_ret__;                             \
        })
 
+/* These are the logging return helpers to be used. */
+#define syserror(format, ...)                    \
+       ({                                       \
+               SYSERROR(format, ##__VA_ARGS__); \
+               (-errno);                        \
+       })
+
+#define syserror_set(__ret__, format, ...)                    \
+       ({                                                    \
+               typeof(__ret__) __internal_ret__ = (__ret__); \
+               errno = labs(__ret__);                        \
+               SYSERROR(format, ##__VA_ARGS__);              \
+               __internal_ret__;                             \
+       })
+
+#define syserror_ret(__ret__, format, ...)                    \
+       ({                                                    \
+               typeof(__ret__) __internal_ret__ = (__ret__); \
+               SYSERROR(format, ##__VA_ARGS__);              \
+               __internal_ret__;                             \
+       })
+
+#define sysdebug(format, ...)                    \
+       ({                                       \
+               SYSDEBUG(format, ##__VA_ARGS__); \
+               (-errno);                        \
+       })
+
+#define sysdebug_set(__ret__, format, ...)                    \
+       ({                                                    \
+               typeof(__ret__) __internal_ret__ = (__ret__); \
+               errno = labs(__ret__);                        \
+               SYSDEBUG(format, ##__VA_ARGS__);              \
+               __internal_ret__;                             \
+       })
+
+#define sysdebug_ret(__ret__, format, ...)                    \
+       ({                                                    \
+               typeof(__ret__) __internal_ret__ = (__ret__); \
+               SYSDEBUG(format, ##__VA_ARGS__);              \
+               __internal_ret__;                             \
+       })
+
 extern int lxc_log_fd;
 
 __hidden extern int lxc_log_syslog(int facility);