summaryrefslogtreecommitdiffstats
path: root/libmount/src/init.c
diff options
context:
space:
mode:
authorOndrej Oprala2014-03-13 10:53:16 +0100
committerOndrej Oprala2014-03-13 11:03:23 +0100
commitd73658219925fb5a8ef55e6408ba3ea5c4688a58 (patch)
tree3ce6170bc66038913f7accf0e7bd13e5c280c3cf /libmount/src/init.c
parentlibcommon: don't mention lib versions in debug macros (diff)
downloadkernel-qcow2-util-linux-d73658219925fb5a8ef55e6408ba3ea5c4688a58.tar.gz
kernel-qcow2-util-linux-d73658219925fb5a8ef55e6408ba3ea5c4688a58.tar.xz
kernel-qcow2-util-linux-d73658219925fb5a8ef55e6408ba3ea5c4688a58.zip
libmount: further debug.h integration
Signed-off-by: Ondrej Oprala <ooprala@redhat.com>
Diffstat (limited to 'libmount/src/init.c')
-rw-r--r--libmount/src/init.c16
1 files changed, 2 insertions, 14 deletions
diff --git a/libmount/src/init.c b/libmount/src/init.c
index a14637d75..19278bb89 100644
--- a/libmount/src/init.c
+++ b/libmount/src/init.c
@@ -15,7 +15,7 @@
#include "mountP.h"
-int libmount_debug_mask;
+UL_DEBUG_DEFINE_MASK(libmount);
/**
* mnt_init_debug:
@@ -29,24 +29,12 @@ int libmount_debug_mask;
*/
void mnt_init_debug(int mask)
{
- if (libmount_debug_mask & MNT_DEBUG_INIT)
- return;
- if (!mask) {
- char *str = getenv("LIBMOUNT_DEBUG");
- if (str)
- libmount_debug_mask = strtoul(str, 0, 0);
- } else
- libmount_debug_mask = mask;
-
- libmount_debug_mask |= MNT_DEBUG_INIT;
+ INIT_DBG(mask);
if (libmount_debug_mask != MNT_DEBUG_INIT) {
const char *ver = NULL;
const char **features = NULL, **p;
- DBG(INIT, mnt_debug("library debug mask: 0x%04x",
- libmount_debug_mask));
-
mnt_get_library_version(&ver);
mnt_get_library_features(&features);