Extract log.h and tweak funcs to be like lvm2 ones.

diff --git a/dmsetup/dmsetup.c b/dmsetup/dmsetup.c
index a51dac319646d43a6c9145a72dd5c312079a4246..cec22e5578047f32ad2693f56b90906734328598 100644 (file)
--- a/dmsetup/dmsetup.c
+++ b/dmsetup/dmsetup.c
@@ -5,6 +5,7 @@
  */
 
 #include "libdevmapper.h"
+#include "log.h"
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/include/log.h b/include/log.h
new file mode 100644 (file)
index 0000000..69533b0
--- /dev/null
+++ b/include/log.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2001 Sistina Software (UK) Limited.
+ *
+ * This file is released under the LGPL.
+ */
+
+#ifndef LIB_DMLOG_H
+#define LIB_DMLOG_H
+
+#include "libdevmapper.h"
+
+#define _LOG_DEBUG 7
+#define _LOG_INFO 6
+#define _LOG_NOTICE 5
+#define _LOG_WARN 4
+#define _LOG_ERR 3
+#define _LOG_FATAL 2
+
+extern dm_log_fn _log;
+
+#define plog(l, x...) _log(l, __FILE__, __LINE__, ## x)
+
+#define log_error(x...) plog(_LOG_ERR, x)
+#define log_print(x...) plog(_LOG_WARN, x)
+#define log_verbose(x...) plog(_LOG_NOTICE, x)
+#define log_very_verbose(x...) plog(_LOG_INFO, x)
+#define log_debug(x...) plog(_LOG_DEBUG, x)
+
+#endif

diff --git a/lib/ioctl/libdevmapper.c b/lib/ioctl/libdevmapper.c
index 10bcba60a228d5a71017d7c8e76a4f3c239a0746..9c2353140e01ebc416e9709a1467f67d8d660181 100644 (file)
--- a/lib/ioctl/libdevmapper.c
+++ b/lib/ioctl/libdevmapper.c
@@ -6,6 +6,7 @@
 
 #include "libdm-targets.h"
 #include "libdm-common.h"
+#include "log.h"
 
 #ifdef DM_COMPAT
 #  include "libdm-compat.h"

diff --git a/lib/libdm-common.c b/lib/libdm-common.c
index 3b67a1b55b360d9bca137c7b6c8921a74482fb03..9bc6878a52e60f3f85b131570e28479328b43fab 100644 (file)
--- a/lib/libdm-common.c
+++ b/lib/libdm-common.c
@@ -7,6 +7,7 @@
 #include "libdm-targets.h"
 #include "libdm-common.h"
 #include "list.h"
+#include "log.h"
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/lib/libdm-common.h.in b/lib/libdm-common.h.in
index 2eabe5ebb2692f4cd475c35acbd9e24bba492c1b..482eebe82dcdfadf5c20130c254801df49d94351 100644 (file)
--- a/lib/libdm-common.h.in
+++ b/lib/libdm-common.h.in
@@ -9,21 +9,6 @@
 
 #include "libdevmapper.h"
 
-#define _LOG_DEBUG 7
-#define _LOG_INFO 6
-#define _LOG_NOTICE 5
-#define _LOG_WARN 4
-#define _LOG_ERR 3
-#define _LOG_FATAL 2
-
-extern dm_log_fn _log;
-
-#define log_error(msg, x...) _log(_LOG_ERR, __FILE__, __LINE__, msg, ## x)
-#define log_print(msg, x...) _log(_LOG_WARN, __FILE__, __LINE__, msg, ## x)
-#define log_verbose(msg, x...) _log(_LOG_NOTICE, __FILE__, __LINE__, msg, ## x)
-#define log_very_verbose(msg, x...) _log(_LOG_INFO, __FILE__, __LINE__, msg, ## x)
-#define log_debug(msg, x...) _log(_LOG_DEBUG, __FILE__, __LINE__, msg, ## x)
-
 struct target *create_target(uint64_t start,
                             uint64_t len,
                             const char *type, const char *params);