From: Franck Bui <fbui@suse.com>
Date: Mon, 27 Apr 2020 16:14:44 +0000 (+0200)
Subject: pid1: make more use of show_status_on()
X-Git-Tag: v246-rc1~130^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b309078ab9685bd549f2614bf99190b5955d21a7;p=thirdparty%2Fsystemd.git

pid1: make more use of show_status_on()

No functional change.
---

diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
index 51254b92da5..4fd49960303 100644
--- a/src/core/dbus-manager.c
+++ b/src/core/dbus-manager.c
@@ -240,7 +240,7 @@ static int property_get_show_status(
         assert(reply);
         assert(m);
 
-        b = IN_SET(m->show_status, SHOW_STATUS_TEMPORARY, SHOW_STATUS_YES);
+        b = show_status_on(m->show_status);
         return sd_bus_message_append_basic(reply, 'b', &b);
 }
 
diff --git a/src/core/manager.c b/src/core/manager.c
index 72dd93fa954..ef0f9aa6b20 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -4265,6 +4265,8 @@ void manager_recheck_journal(Manager *m) {
 }
 
 void manager_set_show_status(Manager *m, ShowStatus mode, const char *reason) {
+        bool enabled;
+
         assert(m);
         assert(mode >= 0 && mode < _SHOW_STATUS_MAX);
 
@@ -4274,11 +4276,12 @@ void manager_set_show_status(Manager *m, ShowStatus mode, const char *reason) {
         if (mode == m->show_status)
                 return;
 
-        bool enabled = IN_SET(mode, SHOW_STATUS_TEMPORARY, SHOW_STATUS_YES);
+        enabled = show_status_on(mode);
         log_debug("%s (%s) showing of status (%s).",
                   enabled ? "Enabling" : "Disabling",
                   strna(show_status_to_string(mode)),
                   reason);
+
         m->show_status = mode;
 
         if (enabled)