clean up redundant macros and defines

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

8 files changed, 4 insertions, 41 deletions

diff --git a/include/debug.h b/include/debug.h
index df0174834..dfb640f6b 100644
--- a/include/debug.h
+++ b/include/debug.h
@@ -7,9 +7,6 @@
 #ifndef UTIL_LINUX_DEBUG_H
 #define UTIL_LINUX_DEBUG_H
 
-#define _UL_DEBUG
-#ifdef _UL_DEBUG
-
 #include <stdarg.h>
 
 #define UL_DEBUG_DEFINE_MASK(m) int m ## _debug_mask
@@ -66,9 +63,4 @@ ul_debugobj(void *handler, const char *mesg, ...)
 	fputc('\n', stderr);
 }
 
-#else /* !_UL_DEBUG */
-# define __UL_DBG(l, p, m, x) do { ; } while (0)
-#define __UL_INIT_DEBUG(lib, pref, mask, env) do { ; } while (0)
-#endif
-
 #endif /* UTIL_LINUX_DEBUG_H */
diff --git a/libblkid/src/blkidP.h b/libblkid/src/blkidP.h
index 62c8412b6..cde8a617f 100644
--- a/libblkid/src/blkidP.h
+++ b/libblkid/src/blkidP.h
@@ -337,15 +337,11 @@ struct blkid_struct_cache
 
 #define BLKID_DEF_FLAG(m) UL_DEFINE_FLAG(BLKID_DEBUG_, m)
 
-#ifdef CONFIG_BLKID_DEBUG
-
 UL_DEBUG_DECLARE_MASK(libblkid);
 extern void blkid_debug_dump_dev(blkid_dev dev);
 extern void blkid_debug_dump_tag(blkid_tag tag);
 
 #define DBG(m, x) do { __UL_DBG(libblkid, BLKID_DEBUG_, m, x); } while (0)
-#define INIT_DBG(m) do { __UL_INIT_DEBUG(libblkid, BLKID_DEBUG_, m, LIBBLKID_DEBUG); } while (0)
-
 
 static inline void __attribute__ ((__format__ (__printf__, 1, 2)))
 blkid_debug(const char *mesg, ...)
@@ -357,11 +353,6 @@ blkid_debug(const char *mesg, ...)
 	fputc('\n', stderr);
 }
 
-#else /* !CONFIG_BLKID_DEBUG */
-# define DBG(m,x) do { ; } while (0)
-# define INIT_DBG(m) do { ; } while (0)
-#endif /* CONFIG_BLKID_DEBUG */
-
 /* devno.c */
 struct dir_list {
 	char	*name;
diff --git a/libblkid/src/init.c b/libblkid/src/init.c
index 04a3b242b..13aa09bb6 100644
--- a/libblkid/src/init.c
+++ b/libblkid/src/init.c
@@ -29,7 +29,7 @@ UL_DEBUG_DEFINE_MASK(libblkid);
  */
 void blkid_init_debug(int mask)
 {
-	INIT_DBG(mask);
+	__UL_INIT_DEBUG(libblkid, BLKID_DEBUG_, mask, LIBBLKID_DEBUG);
 
 	if (libblkid_debug_mask != BLKID_DEBUG_INIT) {
 		const char *ver = NULL;
diff --git a/libfdisk/src/fdiskP.h b/libfdisk/src/fdiskP.h
index d470110da..a945ed3a7 100644
--- a/libfdisk/src/fdiskP.h
+++ b/libfdisk/src/fdiskP.h
@@ -40,7 +40,6 @@
 #define CONFIG_LIBFDISK_DEBUG
 #endif
 
-#ifdef CONFIG_LIBFDISK_DEBUG
 # include <stdio.h>
 # include <stdarg.h>
 
@@ -59,7 +58,6 @@
 #define FDISK_DEF_FLAG(m) UL_DEFINE_FLAG(FDISK_DEBUG_, m)
 
 #define DBG(m, x) do { __UL_DBG(libfdisk, FDISK_DEBUG_, m, x); } while (0)
-#define INIT_DBG(m) do { __UL_INIT_DEBUG(libfdisk, FDISK_DEBUG_, m, LIBFDISK_DEBUG); } while (0)
 
 # define ON_DBG(m, x)	do { \
 				if ((FDISK_DEBUG_ ## m) & libfdisk_debug_mask) { \
@@ -85,14 +83,6 @@ dbgprint(const char *mesg, ...)
 
 UL_DEBUG_DECLARE_MASK(libfdisk);
 
-#else /* !CONFIG_LIBFDISK_DEBUG */
-# define ON_DBG(m,x) do { ; } while (0)
-# define DBG(m,x) do { ; } while (0)
-# define INIT_DBG(m,x) do { ; } while (0)
-# define DBG_FLUSH do { ; } while(0)
-#endif
-
-
 #ifdef TEST_PROGRAM
 struct fdisk_test {
 	const char	*name;
diff --git a/libfdisk/src/init.c b/libfdisk/src/init.c
index c54b72a0c..e30c8b976 100644
--- a/libfdisk/src/init.c
+++ b/libfdisk/src/init.c
@@ -15,5 +15,5 @@ UL_DEBUG_DEFINE_MASK(libfdisk);
  */
 void fdisk_init_debug(int mask)
 {
-	INIT_DBG(mask);
+	__UL_INIT_DEBUG(libfdisk, FDISK_DEBUG_, mask, LIBFDISK_DEBUG);
 }
diff --git a/libmount/src/init.c b/libmount/src/init.c
index 19278bb89..d3aef7fa0 100644
--- a/libmount/src/init.c
+++ b/libmount/src/init.c
@@ -29,7 +29,7 @@ UL_DEBUG_DEFINE_MASK(libmount);
  */
 void mnt_init_debug(int mask)
 {
-	INIT_DBG(mask);
+	__UL_INIT_DEBUG(libmount, MNT_DEBUG_, mask, LIBMOUNT_DEBUG);
 
 	if (libmount_debug_mask != MNT_DEBUG_INIT) {
 		const char *ver = NULL;
diff --git a/libmount/src/mountP.h b/libmount/src/mountP.h
index 1081c0d2f..e703f9bb7 100644
--- a/libmount/src/mountP.h
+++ b/libmount/src/mountP.h
@@ -55,12 +55,10 @@
 
 #define MNT_DEF_FLAG(m) UL_DEFINE_FLAG(MNT_DEBUG_, m)
 
-#ifdef CONFIG_LIBMOUNT_DEBUG
 # 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 { \
@@ -106,14 +104,6 @@ mnt_debug_h(void *handler, const char *mesg, ...)
 	fputc('\n', stderr);
 }
 
-#else /* !CONFIG_LIBMOUNT_DEBUG */
-# define WARN_REFCOUNT(m,o,r)  do { ; } while (0)
-# define ON_DBG(m,x) do { ; } while (0)
-# define DBG(m,x) do { ; } while (0)
-# define INIT_DBG(m,x) do { ; } while (0)
-# define DBG_FLUSH do { ; } while(0)
-#endif
-
 /* extension for files in the directory */
 #define MNT_MNTTABDIR_EXT	".fstab"
 
diff --git a/libmount/src/test.c b/libmount/src/test.c
index 40c344fc2..2da00b40d 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;
 
-	INIT_DBG(0);
+	mnt_init_debug(0);
 
 	for (ts = tests; ts->name; ts++) {
 		if (strcmp(ts->name, argv[1]) == 0) {