log: fix cmd logging

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

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