summaryrefslogtreecommitdiffstats
path: root/libblkid/src/init.c
diff options
context:
space:
mode:
authorOndrej Oprala2014-03-13 11:04:20 +0100
committerOndrej Oprala2014-03-13 11:11:10 +0100
commited64028665fd4803351d92846e061b858da2d5bf (patch)
tree48d744fc6817746e8e202899e9ab6aaace441b5e /libblkid/src/init.c
parentlibmount: further debug.h integration (diff)
downloadkernel-qcow2-util-linux-ed64028665fd4803351d92846e061b858da2d5bf.tar.gz
kernel-qcow2-util-linux-ed64028665fd4803351d92846e061b858da2d5bf.tar.xz
kernel-qcow2-util-linux-ed64028665fd4803351d92846e061b858da2d5bf.zip
libblkid: use include/debug.h
Signed-off-by: Ondrej Oprala <ooprala@redhat.com>
Diffstat (limited to 'libblkid/src/init.c')
-rw-r--r--libblkid/src/init.c16
1 files changed, 2 insertions, 14 deletions
diff --git a/libblkid/src/init.c b/libblkid/src/init.c
index bb6f950fb..04a3b242b 100644
--- a/libblkid/src/init.c
+++ b/libblkid/src/init.c
@@ -15,7 +15,7 @@
#include "blkidP.h"
-int libblkid_debug_mask;
+UL_DEBUG_DEFINE_MASK(libblkid);
/**
* blkid_init_debug:
@@ -29,24 +29,12 @@ int libblkid_debug_mask;
*/
void blkid_init_debug(int mask)
{
- if (libblkid_debug_mask & BLKID_DEBUG_INIT)
- return;
- if (!mask) {
- char *str = getenv("LIBBLKID_DEBUG");
- if (str)
- libblkid_debug_mask = strtoul(str, 0, 0);
- } else
- libblkid_debug_mask = mask;
-
- libblkid_debug_mask |= BLKID_DEBUG_INIT;
+ INIT_DBG(mask);
if (libblkid_debug_mask != BLKID_DEBUG_INIT) {
const char *ver = NULL;
const char *date = NULL;
- DBG(INIT, blkid_debug("library debug mask: 0x%04x",
- libblkid_debug_mask));
-
blkid_get_library_version(&ver, &date);
DBG(INIT, blkid_debug("library version: %s [%s]", ver, date));
}