From 7244eabf78a067517c780f2f0f83b9f2dbd1082b Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Fri, 26 Feb 2021 00:39:35 +0100 Subject: [PATCH] log: mark logging helpers to use Signed-off-by: Christian Brauner --- src/lxc/log.h | 78 ++++++++++++++++++++++++++++----------------------- 1 file changed, 43 insertions(+), 35 deletions(-) diff --git a/src/lxc/log.h b/src/lxc/log.h index 9452e63f2..e8ffb664e 100644 --- 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); -- 2.47.3