From ed64028665fd4803351d92846e061b858da2d5bf Mon Sep 17 00:00:00 2001 From: Ondrej Oprala Date: Thu, 13 Mar 2014 11:04:20 +0100 Subject: libblkid: use include/debug.h Signed-off-by: Ondrej Oprala --- libblkid/src/init.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'libblkid/src/init.c') 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)); } -- cgit v1.2.3-55-g7522