diff options
| author | Karel Zak | 2014-11-03 13:12:20 +0100 |
|---|---|---|
| committer | Karel Zak | 2014-11-03 13:12:20 +0100 |
| commit | b7da851e5a022937ea4d8b777da5551f7e3a2966 (patch) | |
| tree | f80793f7d2986f65e8837ab52324ac20674371cd /libblkid/src/init.c | |
| parent | include/debug: improve and cleanup (diff) | |
| download | kernel-qcow2-util-linux-b7da851e5a022937ea4d8b777da5551f7e3a2966.tar.gz kernel-qcow2-util-linux-b7da851e5a022937ea4d8b777da5551f7e3a2966.tar.xz kernel-qcow2-util-linux-b7da851e5a022937ea4d8b777da5551f7e3a2966.zip | |
libblkid: clean up debug, add "help" debug mask
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'libblkid/src/init.c')
| -rw-r--r-- | libblkid/src/init.c | 40 |
1 files changed, 23 insertions, 17 deletions
diff --git a/libblkid/src/init.c b/libblkid/src/init.c index 7d2651180..eead6c7df 100644 --- a/libblkid/src/init.c +++ b/libblkid/src/init.c @@ -18,22 +18,20 @@ UL_DEBUG_DEFINE_MASK(libblkid); UL_DEBUG_DEFINE_MASKNAMES(libblkid) = { - { "all", BLKID_DEBUG_ALL }, - { "cache", BLKID_DEBUG_CACHE }, - { "dump", BLKID_DEBUG_DUMP }, - { "dev", BLKID_DEBUG_DEV }, - { "devname", BLKID_DEBUG_DEVNAME }, - { "devno", BLKID_DEBUG_DEVNO }, - { "probe", BLKID_DEBUG_PROBE }, - { "read", BLKID_DEBUG_READ }, - { "resolve", BLKID_DEBUG_RESOLVE }, - { "save", BLKID_DEBUG_SAVE }, - { "tag", BLKID_DEBUG_TAG }, - { "lowprobe", BLKID_DEBUG_LOWPROBE }, - { "config", BLKID_DEBUG_CONFIG }, - { "evaluate", BLKID_DEBUG_EVALUATE }, - { "init", BLKID_DEBUG_INIT }, - { NULL, 0 } + { "all", BLKID_DEBUG_ALL, "info about all subsystems" }, + { "cache", BLKID_DEBUG_CACHE, "blkid tags cache" }, + { "config", BLKID_DEBUG_CONFIG, "config file utils" }, + { "dev", BLKID_DEBUG_DEV, "device utils" }, + { "devname", BLKID_DEBUG_DEVNAME, "/proc/partitions evaluation" }, + { "devno", BLKID_DEBUG_DEVNO, "convertions to device name" }, + { "evaluate", BLKID_DEBUG_EVALUATE, "tags resolving" }, + { "help", BLKID_DEBUG_HELP, "this help" }, + { "lowprobe", BLKID_DEBUG_LOWPROBE, "superblock/raids/partitions probing" }, + { "probe", BLKID_DEBUG_PROBE, "devices verification" }, + { "read", BLKID_DEBUG_READ, "cache parsing" }, + { "save", BLKID_DEBUG_SAVE, "cache writing" }, + { "tag", BLKID_DEBUG_TAG, "tags utils" }, + { NULL, 0, NULL } }; /** @@ -48,13 +46,21 @@ UL_DEBUG_DEFINE_MASKNAMES(libblkid) = */ void blkid_init_debug(int mask) { + if (libblkid_debug_mask) + return; + __UL_INIT_DEBUG(libblkid, BLKID_DEBUG_, mask, LIBBLKID_DEBUG); - if (libblkid_debug_mask != BLKID_DEBUG_INIT) { + if (libblkid_debug_mask != BLKID_DEBUG_INIT + && libblkid_debug_mask != (BLKID_DEBUG_HELP|BLKID_DEBUG_INIT)) { const char *ver = NULL; 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 version: %s [%s]", ver, date)); + } + ON_DBG(HELP, ul_debug_print_masks("LIBBLKID_DEBUG", + UL_DEBUG_MASKNAMES(libblkid))); } |