summaryrefslogtreecommitdiffstats
path: root/disk-utils
diff options
context:
space:
mode:
authorKarel Zak2018-01-17 13:58:29 +0100
committerKarel Zak2018-01-17 13:58:29 +0100
commita15dca2f6d0693546138a6a727f019dd8019dee8 (patch)
tree4ca90e704fea0743180867f7ab7f0592672f8562 /disk-utils
parenthwclock: rename --debug option to --verbose (diff)
downloadkernel-qcow2-util-linux-a15dca2f6d0693546138a6a727f019dd8019dee8.tar.gz
kernel-qcow2-util-linux-a15dca2f6d0693546138a6a727f019dd8019dee8.tar.xz
kernel-qcow2-util-linux-a15dca2f6d0693546138a6a727f019dd8019dee8.zip
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>
Diffstat (limited to 'disk-utils')
-rw-r--r--disk-utils/cfdisk.c2
-rw-r--r--disk-utils/fdisk.c2
-rw-r--r--disk-utils/sfdisk.c2
3 files changed, 3 insertions, 3 deletions
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);
}