Skip to content

L
lxc
Unverified Commit 7aea50fe by Christian Brauner Committed by GitHub
Options

Merge pull request #3001 from Rachid-Koucha/patch-11

Use %m instead of strerror() when available
parents 612e48a3 9a719a64
Showing with 41 additions and 0 deletions
src/lxc/log.h
...@@ -416,53 +416,94 @@ ATTR_UNUSED static inline void LXC_##LEVEL(struct lxc_log_locinfo* locinfo, \ ...@@ -416,53 +416,94 @@ ATTR_UNUSED static inline void LXC_##LEVEL(struct lxc_log_locinfo* locinfo, \
LXC_FATAL(&locinfo, format, ##__VA_ARGS__); \ LXC_FATAL(&locinfo, format, ##__VA_ARGS__); \
} while (0) } while (0)
#if HAVE_M_FORMAT
#define SYSTRACE(format, ...) \
TRACE("%m - " format, ##__VA_ARGS__)
#else
#define SYSTRACE(format, ...) \ #define SYSTRACE(format, ...) \
do { \ do { \
lxc_log_strerror_r; \ lxc_log_strerror_r; \
TRACE("%s - " format, ptr, ##__VA_ARGS__); \ TRACE("%s - " format, ptr, ##__VA_ARGS__); \
} while (0) } while (0)
#endif
#if HAVE_M_FORMAT
#define SYSDEBUG(format, ...) \
DEBUG("%m - " format, ##__VA_ARGS__)
#else
#define SYSDEBUG(format, ...) \ #define SYSDEBUG(format, ...) \
do { \ do { \
lxc_log_strerror_r; \ lxc_log_strerror_r; \
DEBUG("%s - " format, ptr, ##__VA_ARGS__); \ DEBUG("%s - " format, ptr, ##__VA_ARGS__); \
} while (0) } while (0)
#endif
#if HAVE_M_FORMAT
#define SYSINFO(format, ...) \
INFO("%m - " format, ##__VA_ARGS__)
#else
#define SYSINFO(format, ...) \ #define SYSINFO(format, ...) \
do { \ do { \
lxc_log_strerror_r; \ lxc_log_strerror_r; \
INFO("%s - " format, ptr, ##__VA_ARGS__); \ INFO("%s - " format, ptr, ##__VA_ARGS__); \
} while (0) } while (0)
#endif
#if HAVE_M_FORMAT
#define SYSNOTICE(format, ...) \
NOTICE("%m - " format, ##__VA_ARGS__)
#else
#define SYSNOTICE(format, ...) \ #define SYSNOTICE(format, ...) \
do { \ do { \
lxc_log_strerror_r; \ lxc_log_strerror_r; \
NOTICE("%s - " format, ptr, ##__VA_ARGS__); \ NOTICE("%s - " format, ptr, ##__VA_ARGS__); \
} while (0) } while (0)
#endif
#if HAVE_M_FORMAT
#define SYSWARN(format, ...) \
WARN("%m - " format, ##__VA_ARGS__)
#else
#define SYSWARN(format, ...) \ #define SYSWARN(format, ...) \
do { \ do { \
lxc_log_strerror_r; \ lxc_log_strerror_r; \
WARN("%s - " format, ptr, ##__VA_ARGS__); \ WARN("%s - " format, ptr, ##__VA_ARGS__); \
} while (0) } while (0)
#endif
#if HAVE_M_FORMAT
#define SYSERROR(format, ...) \
ERROR("%m - " format, ##__VA_ARGS__)
#else
#define SYSERROR(format, ...) \ #define SYSERROR(format, ...) \
do { \ do { \
lxc_log_strerror_r; \ lxc_log_strerror_r; \
ERROR("%s - " format, ptr, ##__VA_ARGS__); \ ERROR("%s - " format, ptr, ##__VA_ARGS__); \
} while (0) } while (0)
#endif
#if HAVE_M_FORMAT
#define CMD_SYSERROR(format, ...) \
fprintf(stderr, "%m - " format, ##__VA_ARGS__)
#else
#define CMD_SYSERROR(format, ...) \ #define CMD_SYSERROR(format, ...) \
do { \ do { \
lxc_log_strerror_r; \ lxc_log_strerror_r; \
fprintf(stderr, "%s - " format, ptr, ##__VA_ARGS__); \ fprintf(stderr, "%s - " format, ptr, ##__VA_ARGS__); \
} while (0) } while (0)
#endif
#if HAVE_M_FORMAT
#define CMD_SYSINFO(format, ...) \
printf("%m - " format, ##__VA_ARGS__)
#else
#define CMD_SYSINFO(format, ...) \ #define CMD_SYSINFO(format, ...) \
do { \ do { \
lxc_log_strerror_r; \ lxc_log_strerror_r; \
printf("%s - " format, ptr, ##__VA_ARGS__); \ printf("%s - " format, ptr, ##__VA_ARGS__); \
} while (0) } while (0)
#endif
extern int lxc_log_fd; extern int lxc_log_fd;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment