]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
login: do not use cast to bool for enum
authorYu Watanabe <watanabe.yu+github@gmail.com>
Mon, 7 Jan 2019 17:39:31 +0000 (02:39 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Mon, 7 Jan 2019 17:39:31 +0000 (02:39 +0900)
src/login/logind-action.c
src/login/logind-dbus.c

index e4e6c9019117088dd945965bc5eca3d696b901c3..6c9366761da71408a10a6b9ceff6a6f76910314b 100644 (file)
@@ -121,7 +121,7 @@ int manager_handle_action(
                 return -EOPNOTSUPP;
         }
 
-        if (m->action_what) {
+        if (m->action_what > 0) {
                 log_debug("Action already in progress, ignoring.");
                 return -EALREADY;
         }
index bd9f5ac4d6cf58a1e24266e07c0e50c23d35151c..4ab0dcb595ef2a115e745e34ad35e129167c57a9 100644 (file)
@@ -1773,7 +1773,7 @@ static int method_do_shutdown_or_sleep(
                 return r;
 
         /* Don't allow multiple jobs being executed at the same time */
-        if (m->action_what)
+        if (m->action_what > 0)
                 return sd_bus_error_setf(error, BUS_ERROR_OPERATION_IN_PROGRESS, "There's already a shutdown or sleep operation in progress");
 
         if (sleep_verb) {
@@ -2012,7 +2012,7 @@ static int manager_scheduled_shutdown_handler(
                 assert_not_reached("unexpected shutdown type");
 
         /* Don't allow multiple jobs being executed at the same time */
-        if (m->action_what) {
+        if (m->action_what > 0) {
                 r = -EALREADY;
                 log_error("Scheduled shutdown to %s failed: shutdown or sleep operation already in progress", target);
                 goto error;