From: Ondrej Oprala <ooprala@redhat.com>
Date: Wed, 12 Mar 2014 13:37:58 +0000 (+0100)
Subject: libmount: use macros from include/debug.h
X-Git-Tag: v2.25-rc1~419^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cedd8e5f6259ce8a552de97a2ed2987739daf5ad;p=thirdparty%2Futil-linux.git

libmount: use macros from include/debug.h

Signed-off-by: Ondrej Oprala <ooprala@redhat.com>
---

diff --git a/libmount/src/mountP.h b/libmount/src/mountP.h
index a580ae4388..6b20f8ff09 100644
--- a/libmount/src/mountP.h
+++ b/libmount/src/mountP.h
@@ -20,6 +20,7 @@
 
 #include "c.h"
 #include "list.h"
+#include "debug.h"
 #include "libmount.h"
 
 /* features */
@@ -56,6 +57,9 @@
 # include <stdio.h>
 # include <stdarg.h>
 
+#define DBG(m, x) do { __UL_DBG(libmount, MNT_DEBUG_, m, x); } while (0)
+#define INIT_DBG(m) do { __UL_INIT_DEBUG(libmount, MNT_DEBUG_, m, LIBMOUNT_DEBUG); } while (0)
+
 # define WARN_REFCOUNT(m, o, r) \
 			do { \
 				if ((MNT_DEBUG_ ## m) & libmount_debug_mask && r != 0) \
@@ -69,13 +73,6 @@
 				} \
 			} while (0)
 
-# define DBG(m, x)	do { \
-				if ((MNT_DEBUG_ ## m) & libmount_debug_mask) { \
-					fprintf(stderr, "%d: libmount: %8s: ", getpid(), # m); \
-					x; \
-				} \
-			} while (0)
-
 # define DBG_FLUSH	do { \
 				if (libmount_debug_mask && \
 				    libmount_debug_mask != MNT_DEBUG_INIT) \
diff --git a/libmount/src/test.c b/libmount/src/test.c
index 2da00b40d6..40c344fc24 100644
--- a/libmount/src/test.c
+++ b/libmount/src/test.c
@@ -31,7 +31,7 @@ int mnt_run_test(struct libmnt_test *tests, int argc, char *argv[])
 	    strcmp(argv[1], "-h") == 0)
 		goto usage;
 
-	mnt_init_debug(0);
+	INIT_DBG(0);
 
 	for (ts = tests; ts->name; ts++) {
 		if (strcmp(ts->name, argv[1]) == 0) {