include/debug: cleanup masks

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/include/debug.h b/include/debug.h
index 65645fe64afed254e63de5239240f774327f5e59..af5b9ea90338dc2dd8841f8a0f86f4ccdfbb2492 100644 (file)
--- a/include/debug.h
+++ b/include/debug.h
@@ -12,6 +12,7 @@
 
 #define UL_DEBUG_DEFINE_MASK(m) int m ## _debug_mask
 #define UL_DEBUG_DECLARE_MASK(m) extern UL_DEBUG_DEFINE_MASK(m)
+#define UL_DEBUG_DEFINE_MASKANEMS(m) static const struct dbg_mask m ## _masknames[]
 
 /* p - flag prefix, m - flag postfix */
 #define UL_DEBUG_DEFINE_FLAG(p, m) p ## m

diff --git a/libblkid/src/init.c b/libblkid/src/init.c
index 61fe5d45e738818f0ca96dc1398b6ecc8b8e3c8f..514faa201c935838a34a425ba5c79d33b1128793 100644 (file)
--- a/libblkid/src/init.c
+++ b/libblkid/src/init.c
@@ -16,8 +16,8 @@
 #include "blkidP.h"
 
 UL_DEBUG_DEFINE_MASK(libblkid);
-
-static const struct dbg_mask libblkid_masknames [] = {
+UL_DEBUG_DEFINE_MASKANEMS(libblkid) =
+{
        { "all", BLKID_DEBUG_ALL },
        { "cache", BLKID_DEBUG_CACHE },
        { "dump", BLKID_DEBUG_DUMP },

diff --git a/libfdisk/src/init.c b/libfdisk/src/init.c
index 87217cbd769ad7581c82fe350206aa729452e189..13964184afc7ba669e4ff06dd4ac10ddbac8d64f 100644 (file)
--- a/libfdisk/src/init.c
+++ b/libfdisk/src/init.c
@@ -2,8 +2,8 @@
 #include "fdiskP.h"
 
 UL_DEBUG_DEFINE_MASK(libfdisk);
-
-static const struct dbg_mask libfdisk_masknames[] = {
+UL_DEBUG_DEFINE_MASKANEMS(libfdisk) =
+{
        { "all", FDISK_DEBUG_ALL },
        { "init", FDISK_DEBUG_INIT },
        { "cxt", FDISK_DEBUG_CXT },

diff --git a/libmount/src/init.c b/libmount/src/init.c
index e460788fb0af75fac1862b3f3bc2654f751c45bf..fda9c15edb30f6960d8b5593d23f97c491384df5 100644 (file)
--- a/libmount/src/init.c
+++ b/libmount/src/init.c
@@ -16,7 +16,8 @@
 #include "mountP.h"
 
 UL_DEBUG_DEFINE_MASK(libmount);
-static const struct dbg_mask libmount_masknames [] = {
+UL_DEBUG_DEFINE_MASKANEMS(libmount) =
+{
        { "all", MNT_DEBUG_ALL },
        { "init", MNT_DEBUG_INIT },
        { "cache", MNT_DEBUG_CACHE },
@@ -31,6 +32,7 @@ static const struct dbg_mask libmount_masknames [] = {
        { "diff", MNT_DEBUG_DIFF },
        { NULL, 0 }
 };
+
 /**
  * mnt_init_debug:
  * @mask: debug mask (0xffff to enable full debugging)