debug: Unify debug mask output

Always format with 0x08x to also cover internal flags. These would be
printed anyway, but now it's always properly formatted.

Keep 0x06x in ul_debug_print_masks since these flags are never supposed
to have any private bits (above UL_DEBUG_ALL) set.

Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>

diff --git a/libblkid/src/init.c b/libblkid/src/init.c
index cc1da0dcc2f5b6adb59747a309eaecc898bb7d5d..7086e228c6ae035bad26c08445a5943e1b3a6306 100644 (file)
--- a/libblkid/src/init.c
+++ b/libblkid/src/init.c
@@ -58,7 +58,7 @@ void blkid_init_debug(int mask)
                const char *date = NULL;
 
                blkid_get_library_version(&ver, &date);
-               DBG(INIT, ul_debug("library debug mask: 0x%04x", libblkid_debug_mask));
+               DBG(INIT, ul_debug("library debug mask: 0x%08x", libblkid_debug_mask));
                DBG(INIT, ul_debug("library version: %s [%s]", ver, date));
 
        }

diff --git a/libfdisk/src/init.c b/libfdisk/src/init.c
index e2e82700de83a11f0f1c2dcd9945cf22930ace8c..55c8a802123d3007bfe84997d92c9ce50def9b21 100644 (file)
--- a/libfdisk/src/init.c
+++ b/libfdisk/src/init.c
@@ -53,7 +53,7 @@ void fdisk_init_debug(int mask)
 
                fdisk_get_library_version(&ver);
 
-               DBG(INIT, ul_debug("library debug mask: 0x%04x", libfdisk_debug_mask));
+               DBG(INIT, ul_debug("library debug mask: 0x%08x", libfdisk_debug_mask));
                DBG(INIT, ul_debug("library version: %s", ver));
        }
 

diff --git a/libmount/python/pylibmount.c b/libmount/python/pylibmount.c
index ff5b958295fb5a62996ae988a28ecb17f5850918..a408b32f89c772b0ef15a135d32d44089b36cd3d 100644 (file)
--- a/libmount/python/pylibmount.c
+++ b/libmount/python/pylibmount.c
@@ -232,7 +232,7 @@ PyMODINIT_FUNC initpylibmount(void)
        }
 
        if (pylibmount_debug_mask && pylibmount_debug_mask != PYMNT_DEBUG_INIT)
-               DBG(INIT, pymnt_debug("library debug mask: 0x%04x",
+               DBG(INIT, pymnt_debug("library debug mask: 0x%08x",
                                        pylibmount_debug_mask));
        mnt_init_debug(0);
 

diff --git a/libmount/src/init.c b/libmount/src/init.c
index 9a6fbe6de18f9d914d90a4d545f5b10f9cc5d471..3b881e68ab10bfab9587ddb9ef9d2cdbeba7a1f0 100644 (file)
--- a/libmount/src/init.c
+++ b/libmount/src/init.c
@@ -69,7 +69,7 @@ void mnt_init_debug(int mask)
                mnt_get_library_version(&ver);
                mnt_get_library_features(&features);
 
-               DBG(INIT, ul_debug("library debug mask: 0x%06x", libmount_debug_mask));
+               DBG(INIT, ul_debug("library debug mask: 0x%08x", libmount_debug_mask));
                DBG(INIT, ul_debug("library version: %s", ver));
                p = features;
                while (p && *p)

diff --git a/libsmartcols/src/init.c b/libsmartcols/src/init.c
index 03967f9dcf1f9a625e6f751b1f83389c2867cf9f..e6eb99a4d53812e70d7c1e6fad312a21f9700e20 100644 (file)
--- a/libsmartcols/src/init.c
+++ b/libsmartcols/src/init.c
@@ -56,7 +56,7 @@ void scols_init_debug(int mask)
 
                scols_get_library_version(&ver);
 
-               DBG(INIT, ul_debug("library debug mask: 0x%04x", libsmartcols_debug_mask));
+               DBG(INIT, ul_debug("library debug mask: 0x%08x", libsmartcols_debug_mask));
                DBG(INIT, ul_debug("library version: %s", ver));
        }
        ON_DBG(HELP, ul_debug_print_masks("LIBSMARTCOLS_DEBUG",

diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c
index 042b2e2c250d3af3cc8b789765f36b8f3a899f31..21f3d9ae674bf271ffde2ae2b290cf5c81dd1987 100644 (file)
--- a/sys-utils/hwclock.c
+++ b/sys-utils/hwclock.c
@@ -145,7 +145,7 @@ static void hwclock_init_debug(const char *str)
 {
        __UL_INIT_DEBUG_FROM_STRING(hwclock, HWCLOCK_DEBUG_, 0, str);
 
-       DBG(INIT, ul_debug("hwclock debug mask: 0x%04x", hwclock_debug_mask));
+       DBG(INIT, ul_debug("hwclock debug mask: 0x%08x", hwclock_debug_mask));
        DBG(INIT, ul_debug("hwclock version: %s", PACKAGE_STRING));
 }
 

diff --git a/tests/expected/libmount/debug-set-from-code b/tests/expected/libmount/debug-set-from-code
index 9066621ceea4b4c48e24c5bca69a544b0ee36f32..1502ac2e1f3a5cb6b9bf55688ff3e0a23556d3af 100644 (file)
--- a/tests/expected/libmount/debug-set-from-code
+++ b/tests/expected/libmount/debug-set-from-code
@@ -1 +1 @@
-0x000016
+0x00000016

diff --git a/tests/expected/libmount/debug-set-from-env-int b/tests/expected/libmount/debug-set-from-env-int
index 9066621ceea4b4c48e24c5bca69a544b0ee36f32..1502ac2e1f3a5cb6b9bf55688ff3e0a23556d3af 100644 (file)
--- a/tests/expected/libmount/debug-set-from-env-int
+++ b/tests/expected/libmount/debug-set-from-env-int
@@ -1 +1 @@
-0x000016
+0x00000016

diff --git a/tests/expected/libmount/debug-set-from-env-str b/tests/expected/libmount/debug-set-from-env-str
index 9066621ceea4b4c48e24c5bca69a544b0ee36f32..1502ac2e1f3a5cb6b9bf55688ff3e0a23556d3af 100644 (file)
--- a/tests/expected/libmount/debug-set-from-env-str
+++ b/tests/expected/libmount/debug-set-from-env-str
@@ -1 +1 @@
-0x000016
+0x00000016