From a15dca2f6d0693546138a6a727f019dd8019dee8 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Wed, 17 Jan 2018 13:58:29 +0100 Subject: 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 Signed-off-by: Karel Zak --- disk-utils/cfdisk.c | 2 +- disk-utils/fdisk.c | 2 +- disk-utils/sfdisk.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'disk-utils') diff --git a/disk-utils/cfdisk.c b/disk-utils/cfdisk.c index 286f88abb..806bff837 100644 --- 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 index 226f07065..95bc83696 100644 --- 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 index 5a992342a..9f031126f 100644 --- 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); } -- cgit v1.2.3-55-g7522