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 05b4afda54c4f594ad13202318194a51a078293d..c6a0f8efc36c6d5e2d1e9e8ab1c487f07203f61d 100644 (file)
--- 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 74ca1cb26259a5700d4b3e92a5fae676ef036465..2c5b0e8f7df0c03f2734f9ce6b199ae5854a6fb9 100644 (file)
--- 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 c4d9bf58555812a411a1251c3fc4bf65927740d3..5a175b11373bb1206d7de456c89ca37d66c2a6a0 100644 (file)
--- 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 c3c2185a40d8d0f5c92974e40336709fbbb4d1fa..74cebe1f7116bbbcd413913a0aba860df0b8916c 100644 (file)
--- 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 dc4214d162b458dcdf0234b25713ef21e3870084..042db7db3f52dc91c8e5bcabdacdcce6ea2c4041 100644 (file)
--- 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 27823ab219175a9bb7877c0b5d6efbe68ad11079..67ea44515ab9ba0b2874bf1339a89f19b606a6e8 100644 (file)
--- 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(