From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 3 Feb 2022 12:42:55 +0000 (+0100)
Subject: systemctl: use STR_IN_SET() where appropriate
X-Git-Tag: v251-rc1~362
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f80c3d5c7a273d893e2fdf85f3229eb2675b5c59;p=thirdparty%2Fsystemd.git

systemctl: use STR_IN_SET() where appropriate

Follow-up for: 8e98568165ee3db049160045d94ce030dc7fbb79
---

diff --git a/src/systemctl/systemctl-logind.c b/src/systemctl/systemctl-logind.c
index 9bf24ed5549..d502a7edcf7 100644
--- a/src/systemctl/systemctl-logind.c
+++ b/src/systemctl/systemctl-logind.c
@@ -389,13 +389,15 @@ int logind_show_shutdown(void) {
         if (isempty(action))
                 return log_error_errno(SYNTHETIC_ERRNO(ENODATA), "No scheduled shutdown.");
 
-        if (streq(action, "halt") || streq(action, "poweroff") || streq(action, "exit"))
+        if (STR_IN_SET(action, "halt", "poweroff", "exit"))
                 action = "Shutdown";
         else if (streq(action, "kexec"))
                 action = "Reboot via kexec";
         else if (streq(action, "reboot"))
                 action = "Reboot";
 
+        /* If we don't recognize the action string, we'll show it as-is */
+
         log_info("%s scheduled for %s, use 'shutdown -c' to cancel.",
                  action,
                  FORMAT_TIMESTAMP_STYLE(elapse, arg_timestamp_style));