From: Karel Zak <kzak@redhat.com>
Date: Wed, 13 Aug 2014 12:13:32 +0000 (+0200)
Subject: include/debug: cleanup masks
X-Git-Tag: v2.26-rc1~523
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03e4220d29d088f04b5a08aa005c1809978c620d;p=thirdparty%2Futil-linux.git

include/debug: cleanup masks

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

diff --git a/include/debug.h b/include/debug.h
index 65645fe64a..af5b9ea903 100644
--- 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 61fe5d45e7..514faa201c 100644
--- 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 87217cbd76..13964184af 100644
--- 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 e460788fb0..fda9c15edb 100644
--- 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)