log: add missing variable and fix CMD_SYSINFO()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

log: add missing variable and fix CMD_SYSINFO()
3e92b6f7 · Christian Brauner · 53c76225 · 3e92b6f7
Unverified Commit 3e92b6f7 authored Mar 20, 2020 by Christian Brauner
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 5 deletions

log.h src/lxc/log.h +6 -5

No files found.
--- a/src/lxc/log.h
+++ b/src/lxc/log.h
@@ -464,7 +464,7 @@ __lxc_unused static inline void LXC_##LEVEL(struct lxc_log_locinfo* locinfo,	\
 	do {                                                               \
 		lxc_log_strerror_r;                                        \
 		fprintf(stderr, "%s - %s: %d: %s: " format "\n", __FILE__, \
-			__LINE__, __func__, ##__VA_ARGS__);                \
+			__LINE__, __func__, ptr, ##__VA_ARGS__);           \
 	} while (0)
 #endif

@@ -472,10 +472,11 @@ __lxc_unused static inline void LXC_##LEVEL(struct lxc_log_locinfo* locinfo,	\
 #define CMD_SYSINFO(format, ...)                            \
 		printf("%m - " format, ##__VA_ARGS__)
 #else
-#define CMD_SYSINFO(format, ...)                            \
-	do {                                                \
-		lxc_log_strerror_r;                         \
-		printf("%s - " format, ptr, ##__VA_ARGS__); \
+#define CMD_SYSINFO(format, ...)                                            \
+	do {                                                                \
+		lxc_log_strerror_r;                                         \
+		prinft("%s - %s: %d: %s: " format "\n", __FILE__, __LINE__, \
+		       __func__, ptr, ##__VA_ARGS__);                       \
 	} while (0)
 #endif