Skip to content

L
lxc
Unverified Commit 0c241537 by Stéphane Graber Committed by GitHub
Options

Merge pull request #3318 from brauner/2020-03-20/fixes

log: fix cmd logging
parents 2570641c a1162a6c
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, \ ...@@ -456,27 +456,28 @@ __lxc_unused static inline void LXC_##LEVEL(struct lxc_log_locinfo* locinfo, \
#endif #endif
#if HAVE_M_FORMAT #if HAVE_M_FORMAT
#define CMD_SYSERROR(format, ...) \ #define CMD_SYSERROR(format, ...) \
fprintf(stderr, "%m - %s: %d: %s: " format "\n", __FILE__, __LINE__, \ fprintf(stderr, "%s: %d: %s - %m - " format "\n", __FILE__, __LINE__, \
__func__, ##__VA_ARGS__); __func__, ##__VA_ARGS__);
#else #else
#define CMD_SYSERROR(format, ...) \ #define CMD_SYSERROR(format, ...) \
do { \ do { \
lxc_log_strerror_r; \ lxc_log_strerror_r; \
fprintf(stderr, "%s - %s: %d: %s: " format "\n", __FILE__, \ fprintf(stderr, "%s: %d: %s - %s - " format "\n", __FILE__, \
__LINE__, __func__, ptr, ##__VA_ARGS__); \ __LINE__, __func__, ptr, ##__VA_ARGS__); \
} while (0) } while (0)
#endif #endif
#if HAVE_M_FORMAT #if HAVE_M_FORMAT
#define CMD_SYSINFO(format, ...) \ #define CMD_SYSINFO(format, ...) \
printf("%m - " format, ##__VA_ARGS__) printf("%s: %d: %s - %m - " format "\n", __FILE__, __LINE__, __func__, \
##__VA_ARGS__);
#else #else
#define CMD_SYSINFO(format, ...) \ #define CMD_SYSINFO(format, ...) \
do { \ do { \
lxc_log_strerror_r; \ lxc_log_strerror_r; \
prinft("%s - %s: %d: %s: " format "\n", __FILE__, __LINE__, \ printf("%s: %d: %s - %s - " format "\n", __FILE__, __LINE__, \
__func__, ptr, ##__VA_ARGS__); \ __func__, ptr, ##__VA_ARGS__); \
} while (0) } while (0)
#endif #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