include/debug: introduce __UL_INIT_DEBUG_FROM_STRING()

Let's make it possible to use debug.h without environment variables. Suggested-by: J William Piggott <elseifthen@gmx.com> Signed-off-by: Karel Zak <kzak@redhat.com>
util-linux · Jan 17, 2018 · a15dca2 · a15dca2
1 parent de4568f
commit a15dca2
Show file tree

Hide file tree

Showing 15 changed files with 26 additions and 21 deletions.
diff --git a/disk-utils/cfdisk.c b/disk-utils/cfdisk.c
@@ -264,7 +264,7 @@ UL_DEBUG_DEFINE_MASKNAMES(cfdisk) = UL_DEBUG_EMPTY_MASKNAMES;
 
 static void cfdisk_init_debug(void)
 {
-	__UL_INIT_DEBUG(cfdisk, CFDISK_DEBUG_, 0, CFDISK_DEBUG);
+	__UL_INIT_DEBUG_FROM_ENV(cfdisk, CFDISK_DEBUG_, 0, CFDISK_DEBUG);
 }
 
 /* Initialize output columns -- we follow libfdisk fields (usually specific

diff --git a/disk-utils/fdisk.c b/disk-utils/fdisk.c
@@ -68,7 +68,7 @@ UL_DEBUG_DEFINE_MASKNAMES(fdisk) = UL_DEBUG_EMPTY_MASKNAMES;
 
 static void fdiskprog_init_debug(void)
 {
-	__UL_INIT_DEBUG(fdisk, FDISKPROG_DEBUG_, 0, FDISK_DEBUG);
+	__UL_INIT_DEBUG_FROM_ENV(fdisk, FDISKPROG_DEBUG_, 0, FDISK_DEBUG);
 }
 
 static void reply_sighandler(int sig __attribute__((unused)))

diff --git a/disk-utils/sfdisk.c b/disk-utils/sfdisk.c
@@ -119,7 +119,7 @@ struct sfdisk {
 
 static void sfdiskprog_init_debug(void)
 {
-	__UL_INIT_DEBUG(sfdisk, SFDISKPROG_DEBUG_, 0, SFDISK_DEBUG);
+	__UL_INIT_DEBUG_FROM_ENV(sfdisk, SFDISKPROG_DEBUG_, 0, SFDISK_DEBUG);
 }
 
 

diff --git a/include/debug.h b/include/debug.h
@@ -83,15 +83,12 @@ struct ul_debug_maskname {
 		} \
 	} while (0)
 
-
-#define __UL_INIT_DEBUG(lib, pref, mask, env) \
+#define __UL_INIT_DEBUG_FROM_STRING(lib, pref, mask, str) \
 	do { \
 		if (lib ## _debug_mask & pref ## INIT) \
 		; \
-		else if (!mask) { \
-			char *str = getenv(# env); \
-			if (str) \
-				lib ## _debug_mask = ul_debug_parse_envmask(lib ## _masknames, str); \
+		else if (!mask && str) { \
+			lib ## _debug_mask = ul_debug_parse_mask(lib ## _masknames, str); \
 		} else \
 			lib ## _debug_mask = mask; \
 		if (lib ## _debug_mask) { \
@@ -104,6 +101,14 @@ struct ul_debug_maskname {
 	} while (0)
 
 
+#define __UL_INIT_DEBUG_FROM_ENV(lib, pref, mask, env) \
+	do { \
+		const char *envstr = mask ? NULL : getenv(# env); \
+		__UL_INIT_DEBUG_FROM_STRING(lib, pref, mask, envstr); \
+	} while (0)
+
+
+
 static inline void __attribute__ ((__format__ (__printf__, 1, 2)))
 ul_debug(const char *mesg, ...)
 {
@@ -114,7 +119,7 @@ ul_debug(const char *mesg, ...)
 	fputc('\n', stderr);
 }
 
-static inline int ul_debug_parse_envmask(
+static inline int ul_debug_parse_mask(
 			const struct ul_debug_maskname flagnames[],
 			const char *mask)
 {

diff --git a/lib/colors.c b/lib/colors.c
@@ -646,7 +646,7 @@ static int colors_read_schemes(struct ul_color_ctl *cc)
 
 static void termcolors_init_debug(void)
 {
-	__UL_INIT_DEBUG(termcolors, TERMCOLORS_DEBUG_, 0, TERMINAL_COLORS_DEBUG);
+	__UL_INIT_DEBUG_FROM_ENV(termcolors, TERMCOLORS_DEBUG_, 0, TERMINAL_COLORS_DEBUG);
 }
 
 static int colors_terminal_is_ready(void)

diff --git a/lib/loopdev.c b/lib/loopdev.c
@@ -64,7 +64,7 @@ static void loopdev_init_debug(void)
 {
 	if (loopdev_debug_mask)
 		return;
-	__UL_INIT_DEBUG(loopdev, LOOPDEV_DEBUG_, 0, LOOPDEV_DEBUG);
+	__UL_INIT_DEBUG_FROM_ENV(loopdev, LOOPDEV_DEBUG_, 0, LOOPDEV_DEBUG);
 }
 
 /*

diff --git a/libblkid/src/init.c b/libblkid/src/init.c
@@ -50,7 +50,7 @@ void blkid_init_debug(int mask)
 	if (libblkid_debug_mask)
 		return;
 
-	__UL_INIT_DEBUG(libblkid, BLKID_DEBUG_, mask, LIBBLKID_DEBUG);
+	__UL_INIT_DEBUG_FROM_ENV(libblkid, BLKID_DEBUG_, mask, LIBBLKID_DEBUG);
 
 	if (libblkid_debug_mask != BLKID_DEBUG_INIT
 	    && libblkid_debug_mask != (BLKID_DEBUG_HELP|BLKID_DEBUG_INIT)) {

diff --git a/libfdisk/src/init.c b/libfdisk/src/init.c
@@ -43,7 +43,7 @@ void fdisk_init_debug(int mask)
 	if (libfdisk_debug_mask)
 		return;
 
-	__UL_INIT_DEBUG(libfdisk, LIBFDISK_DEBUG_, mask, LIBFDISK_DEBUG);
+	__UL_INIT_DEBUG_FROM_ENV(libfdisk, LIBFDISK_DEBUG_, mask, LIBFDISK_DEBUG);
 
 
 	if (libfdisk_debug_mask != LIBFDISK_DEBUG_INIT

diff --git a/libmount/src/init.c b/libmount/src/init.c
@@ -51,7 +51,7 @@ void mnt_init_debug(int mask)
 	if (libmount_debug_mask)
 		return;
 
-	__UL_INIT_DEBUG(libmount, MNT_DEBUG_, mask, LIBMOUNT_DEBUG);
+	__UL_INIT_DEBUG_FROM_ENV(libmount, MNT_DEBUG_, mask, LIBMOUNT_DEBUG);
 
 	if (libmount_debug_mask != MNT_DEBUG_INIT
 	    && libmount_debug_mask != (MNT_DEBUG_HELP|MNT_DEBUG_INIT)) {

diff --git a/libsmartcols/src/init.c b/libsmartcols/src/init.c
@@ -45,7 +45,7 @@ void scols_init_debug(int mask)
 	if (libsmartcols_debug_mask)
 		return;
 
-	__UL_INIT_DEBUG(libsmartcols, SCOLS_DEBUG_, mask, LIBSMARTCOLS_DEBUG);
+	__UL_INIT_DEBUG_FROM_ENV(libsmartcols, SCOLS_DEBUG_, mask, LIBSMARTCOLS_DEBUG);
 
 	if (libsmartcols_debug_mask != SCOLS_DEBUG_INIT
 	    && libsmartcols_debug_mask != (SCOLS_DEBUG_HELP|SCOLS_DEBUG_INIT)) {

diff --git a/login-utils/su-common.c b/login-utils/su-common.c
@@ -172,7 +172,7 @@ su_catch_sig(int sig)
 
 static void su_init_debug(void)
 {
-	__UL_INIT_DEBUG(su, SU_DEBUG_, 0, SU_DEBUG);
+	__UL_INIT_DEBUG_FROM_ENV(su, SU_DEBUG_, 0, SU_DEBUG);
 }
 
 static void init_tty(struct su_context *su)

diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
@@ -301,7 +301,7 @@ struct blkdev_cxt {
 
 static void lsblk_init_debug(void)
 {
-	__UL_INIT_DEBUG(lsblk, LSBLK_DEBUG_, 0, LSBLK_DEBUG);
+	__UL_INIT_DEBUG_FROM_ENV(lsblk, LSBLK_DEBUG_, 0, LSBLK_DEBUG);
 }
 
 static int is_maj_excluded(int maj)

diff --git a/misc-utils/whereis.c b/misc-utils/whereis.c
@@ -178,7 +178,7 @@ static const char *srcdirs[] = {
 
 static void whereis_init_debug(void)
 {
-	__UL_INIT_DEBUG(whereis, WHEREIS_DEBUG_, 0, WHEREIS_DEBUG);
+	__UL_INIT_DEBUG_FROM_ENV(whereis, WHEREIS_DEBUG_, 0, WHEREIS_DEBUG);
 }
 
 static const char *whereis_type_to_name(int type)

diff --git a/sys-utils/lsns.c b/sys-utils/lsns.c
@@ -194,7 +194,7 @@ static int netlink_fd = -1;
 
 static void lsns_init_debug(void)
 {
-	__UL_INIT_DEBUG(lsns, LSNS_DEBUG_, 0, LSNS_DEBUG);
+	__UL_INIT_DEBUG_FROM_ENV(lsns, LSNS_DEBUG_, 0, LSNS_DEBUG);
 }
 
 static int ns_name2type(const char *name)

diff --git a/term-utils/script.c b/term-utils/script.c
@@ -132,7 +132,7 @@ struct script_control {
 
 static void script_init_debug(void)
 {
-	__UL_INIT_DEBUG(script, SCRIPT_DEBUG_, 0, SCRIPT_DEBUG);
+	__UL_INIT_DEBUG_FROM_ENV(script, SCRIPT_DEBUG_, 0, SCRIPT_DEBUG);
 }
 
 /*