From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Fri, 8 Oct 2021 09:53:23 +0000 (+0200)
Subject: tree-wide: assorted Coccinelle fixes
X-Git-Tag: v250-rc1~546
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b98416e1002bccfa2cf576a290d321fdf1ce254e;p=thirdparty%2Fsystemd.git

tree-wide: assorted Coccinelle fixes

It's that time of year again.
---

diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c
index 05b4afda54c..c6a0f8efc36 100644
--- a/src/analyze/analyze.c
+++ b/src/analyze/analyze.c
@@ -1412,7 +1412,7 @@ static int verb_log_control(int argc, char *argv[], void *userdata) {
         _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
         int r;
 
-        assert(argc == 1 || argc == 2);
+        assert(IN_SET(argc, 1, 2));
 
         r = acquire_bus(&bus, NULL);
         if (r < 0)
@@ -2284,7 +2284,7 @@ static int do_security(int argc, char *argv[], void *userdata) {
                 if (r < 0 && r != -ENOENT)
                         return r;
 
-                if (f != NULL) {
+                if (f) {
                         r = json_parse_file(f, pp, /*flags=*/ 0, &policy, &line, &column);
                         if (r < 0)
                                 return log_error_errno(r, "[%s:%u:%u] Failed to parse JSON policy: %m", pp, line, column);
diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c
index 74ca1cb2625..2c5b0e8f7df 100644
--- a/src/cryptsetup/cryptsetup.c
+++ b/src/cryptsetup/cryptsetup.c
@@ -1004,7 +1004,7 @@ static int attach_luks2_by_pkcs11(
                 bool headless,
                 uint32_t flags) {
 
-        int r = -ENOTSUP;
+        int r = -EOPNOTSUPP;
 #if HAVE_LIBCRYPTSETUP_PLUGINS
         if (!crypt_get_type(cd) || strcmp(crypt_get_type(cd), CRYPT_LUKS2))
                 return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Automatic PKCS#11 metadata requires LUKS2 device.");
@@ -1198,7 +1198,7 @@ static int attach_luks2_by_tpm2(
                 .device = arg_tpm2_device
         };
 
-        if (crypt_token_external_path() == NULL)
+        if (!crypt_token_external_path())
                 return log_debug_errno(SYNTHETIC_ERRNO(EOPNOTSUPP),
                                        "Libcryptsetup has external plugins support disabled.");
 
diff --git a/src/resolve/resolvectl.c b/src/resolve/resolvectl.c
index c4d9bf58555..5a175b11373 100644
--- a/src/resolve/resolvectl.c
+++ b/src/resolve/resolvectl.c
@@ -2540,7 +2540,7 @@ static int verb_log_level(int argc, char *argv[], void *userdata) {
         sd_bus *bus = userdata;
 
         assert(bus);
-        assert(argc == 1 || argc == 2);
+        assert(IN_SET(argc, 1, 2));
 
         return verb_log_control_common(bus, "org.freedesktop.resolve1", argv[0], argc == 2 ? argv[1] : NULL);
 }
diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c
index c3c2185a40d..74cebe1f711 100644
--- a/src/shared/dissect-image.c
+++ b/src/shared/dissect-image.c
@@ -1596,7 +1596,7 @@ int dissect_image(
                         }
 
                         if (m->verity_ready)
-                                m->verity_sig_ready = !!verity->root_hash_sig;
+                                m->verity_sig_ready = verity->root_hash_sig;
 
                 } else if (m->partitions[verity->designator == PARTITION_USR ? PARTITION_USR_VERITY_SIG : PARTITION_ROOT_VERITY_SIG].found) {
 
diff --git a/src/shared/exec-util.c b/src/shared/exec-util.c
index dc4214d162b..042db7db3f5 100644
--- a/src/shared/exec-util.c
+++ b/src/shared/exec-util.c
@@ -529,7 +529,7 @@ int fork_agent(const char *name, int except[], size_t n_except, pid_t *ret_pid,
                  * stdin around. */
                 fd = open("/dev/tty", O_WRONLY);
                 if (fd < 0) {
-                        if (errno != -ENXIO) {
+                        if (errno != ENXIO) {
                                 log_error_errno(errno, "Failed to open /dev/tty: %m");
                                 _exit(EXIT_FAILURE);
                         }
diff --git a/src/shared/pkcs11-util.c b/src/shared/pkcs11-util.c
index 27823ab2191..67ea44515ab 100644
--- a/src/shared/pkcs11-util.c
+++ b/src/shared/pkcs11-util.c
@@ -219,9 +219,9 @@ int pkcs11_token_login_by_pin(
                 return log_error_errno(SYNTHETIC_ERRNO(EIO),
                                        "Failed to log into security token '%s': %s", token_label, p11_kit_strerror(rv));
 
-        log_notice("PIN for token '%s' is incorrect, please try again.", token_label);
-
-        return -ENOLCK;
+        return log_notice_errno(SYNTHETIC_ERRNO(ENOLCK),
+                                "PIN for token '%s' is incorrect, please try again.",
+                                token_label);
 }
 
 int pkcs11_token_login(