From 72b58b9e6b7271bd4b20933b2992d55f8b4d31b4 Mon Sep 17 00:00:00 2001 From: William Hubbs Date: Mon, 26 Aug 2013 14:31:34 -0500 Subject: [PATCH] Revert "Libeinfo: do not suppress ewarn() messages" This reverts commit 4ee62c7903c65557c493f51d6703264a816156cd. The previously referenced commit broke consistency because ewarnx() was respecting the EINFO_QUIET environment setting, but after this commit, ewarn() was not. Also, due to discussion on the below referenced bugs, I think we do want to suppress warnings when EINFO_QUIET=yes. X-Gentoo-Bug: 482396 X-Gentoo-Bug: 439174 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=482396 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=439174 --- man/einfo.3 | 3 ++- src/libeinfo/libeinfo.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/man/einfo.3 b/man/einfo.3 index f613df34..0af12a8b 100644 --- a/man/einfo.3 +++ b/man/einfo.3 @@ -105,7 +105,8 @@ and respectively, but only work when .Va EINFO_VERBOSE is true. You can also make the -.Fn einfo +.Fn einfo , +.Fn ewarn , and .Fn ebegin functions silent by setting diff --git a/src/libeinfo/libeinfo.c b/src/libeinfo/libeinfo.c index 6f0ca766..d27bdb2f 100644 --- a/src/libeinfo/libeinfo.c +++ b/src/libeinfo/libeinfo.c @@ -705,7 +705,7 @@ ewarn(const char *EINFO_RESTRICT fmt, ...) int retval; va_list ap; - if (!fmt) + if (!fmt || is_quiet()) return 0; va_start(ap, fmt); elogv(LOG_WARNING, fmt, ap);