lxc: cleanup log

some headers and macros are now redundant

Signed-off-by: Cedric Le Goater <legoater@free.fr>
Acked-by: Daniel Lezcano <dlezcano@fr.ibm.com>
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>

diff --git a/src/lxc/console.c b/src/lxc/console.c
index 61d4656a0871043cfbb2e0b89eaec6f12c4c03e8..d8c8a1066de8031c1c2a565b3b4ab1d05b693336 100644 (file)
--- a/src/lxc/console.c
+++ b/src/lxc/console.c
@@ -27,7 +27,6 @@
 #include <sys/types.h>
 #include <sys/un.h>
 
-#include "log.h"
 #include "af_unix.h"
 #include "error.h"
 

diff --git a/src/lxc/log.c b/src/lxc/log.c
index 676e5d3e7f04caa8451e7a04db791db3eb856833..9b7de4ff37a1885f54670f18afd2ed9ee7e75ace 100644 (file)
--- a/src/lxc/log.c
+++ b/src/lxc/log.c
@@ -127,7 +127,3 @@ extern int lxc_log_init(const char *file, int priority, const char *prefix)
 
        return 0;
 }
-
-
-#define MAXTIMELEN 47;
-#define ERRNO_FORMAT "%d (%s)"

diff --git a/src/lxc/log.h b/src/lxc/log.h
index 39005b46ab41557d0fae7ea55291b9df68920170..1e3f5ee163c0daa9eddeefe966da721596ad3b30 100644 (file)
--- a/src/lxc/log.h
+++ b/src/lxc/log.h
@@ -244,21 +244,4 @@ extern struct lxc_log_category lxc_log_category_lxc;
        ERROR("%s - " format "\n", strerror(errno), ##__VA_ARGS__);     \
 } while (0)
 
-
-#define lxc_log(format, level, ...) do {                              \
-               fprintf(stderr, "[%s] \t%s:%d - " format "\n", \
-                       level, __FUNCTION__, __LINE__, ##__VA_ARGS__); \
-       } while (0)
-
-#define lxc_log_error(format, ...) lxc_log(format, "error", ##__VA_ARGS__);
-#define lxc_log_warning(format, ...) lxc_log(format, "warning", ##__VA_ARGS__);
-#define lxc_log_info(format, ...) lxc_log(format, "info", ##__VA_ARGS__);
-#define lxc_log_debug(format, ...) lxc_log(format, "debug", ##__VA_ARGS__);
-#define lxc_log_trace(format, ...) lxc_log(format, "trace", ##__VA_ARGS__);
-#define lxc_log_syserror(format, ...) do { \
-               fprintf(stderr, "[syserr] \t%s:%d: %s - " format "\n", \
-                       __FUNCTION__, __LINE__, strerror(errno), \
-                       ##__VA_ARGS__);                                 \
-       } while (0)
-
 #endif

diff --git a/src/lxc/parse.c b/src/lxc/parse.c
index 2366be9f349bd140e292be95f611938828130fdc..9eafe27f4e1cfbf883f2a9499fb82cbdd16a4340 100644 (file)
--- a/src/lxc/parse.c
+++ b/src/lxc/parse.c
@@ -27,7 +27,6 @@
 #include <dirent.h>
 
 #include "parse.h"
-#include "log.h"
 #include <lxc/log.h>
 
 lxc_log_define(lxc_parse, lxc);