log: add missing variable and fix CMD_SYSINFO()

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

diff --git a/src/lxc/log.h b/src/lxc/log.h
index 50eafe5d6bb35d0028b24aea0becc60ac3f4d1c1..7bd3556a8e28cb0cf3bea904e5fdb93a349837df 100644 (file)
--- 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