Skip to content

L
lxc
Unverified Commit a1162a6c by Christian Brauner
Options

log: fix cmd logging

Signed-off-by: 's avatarChristian Brauner <christian.brauner@ubuntu.com>
parent d7314671
Showing with 15 additions and 14 deletions
src/lxc/log.h
......@@ -456,27 +456,28 @@ __lxc_unused static inline void LXC_##LEVEL(struct lxc_log_locinfo* locinfo, \
#endif
#if HAVE_M_FORMAT
#define CMD_SYSERROR(format, ...) \
fprintf(stderr, "%m - %s: %d: %s: " format "\n", __FILE__, __LINE__, \
#define CMD_SYSERROR(format, ...) \
fprintf(stderr, "%s: %d: %s - %m - " format "\n", __FILE__, __LINE__, \
__func__, ##__VA_ARGS__);
#else
#define CMD_SYSERROR(format, ...) \
do { \
lxc_log_strerror_r; \
fprintf(stderr, "%s - %s: %d: %s: " format "\n", __FILE__, \
__LINE__, __func__, ptr, ##__VA_ARGS__); \
#define CMD_SYSERROR(format, ...) \
do { \
lxc_log_strerror_r; \
fprintf(stderr, "%s: %d: %s - %s - " format "\n", __FILE__, \
__LINE__, __func__, ptr, ##__VA_ARGS__); \
} while (0)
#endif
#if HAVE_M_FORMAT
#define CMD_SYSINFO(format, ...) \
printf("%m - " format, ##__VA_ARGS__)
#define CMD_SYSINFO(format, ...) \
printf("%s: %d: %s - %m - " format "\n", __FILE__, __LINE__, __func__, \
##__VA_ARGS__);
#else
#define CMD_SYSINFO(format, ...) \
do { \
lxc_log_strerror_r; \
prinft("%s - %s: %d: %s: " format "\n", __FILE__, __LINE__, \
__func__, ptr, ##__VA_ARGS__); \
#define CMD_SYSINFO(format, ...) \
do { \
lxc_log_strerror_r; \
printf("%s: %d: %s - %s - " format "\n", __FILE__, __LINE__, \
__func__, ptr, ##__VA_ARGS__); \
} while (0)
#endif
......
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