From 8aa82616b19734a3e80394da88e922c2d9ef646c Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Thu, 25 Feb 2021 23:29:37 +0100 Subject: [PATCH] log: add some more log and return helpers Signed-off-by: Christian Brauner --- src/lxc/log.h | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/src/lxc/log.h b/src/lxc/log.h index 2c536aa98..fdf35bd7e 100644 --- a/src/lxc/log.h +++ b/src/lxc/log.h @@ -508,13 +508,6 @@ __lxc_unused static inline void LXC_##LEVEL(struct lxc_log_locinfo* locinfo, \ __internal_ret__; \ }) -#define sysdebug(__ret__, format, ...) \ - ({ \ - typeof(__ret__) __internal_ret__ = (__ret__); \ - SYSDEBUG(format, ##__VA_ARGS__); \ - __internal_ret__; \ - }) - #define systrace(__ret__, format, ...) \ ({ \ typeof(__ret__) __internal_ret__ = (__ret__); \ @@ -545,6 +538,34 @@ __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 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__); \ -- 2.47.2