Merge pull request #23560 from mrc0mmand/coccinelle

A couple of tweaks suggested by Coccinelle

coccinelle/in_set.cocci

@@ -1,26 +1,38 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 /* Limit the number of expressions to 6 for performance reasons */
+
+@ is_in_assert_cc @
+identifier id = assert_cc;
+position p1;
+expression e;
+constant n0;
+@@
+
+ id(e@p1 == n0 || ...);
+
 @@
 expression e;
+position p2 != is_in_assert_cc.p1;
 /* Exclude JsonVariant * from the transformation, as it can't work with the
  * current version of the IN_SET macro */
 typedef JsonVariant;
 type T != JsonVariant*;
 constant T n0, n1, n2, n3, n4, n5;
 @@
+
 (
-- e == n0 || e == n1 || e == n2 || e == n3 || e == n4 || e == n5
+- e@p2 == n0 || e == n1 || e == n2 || e == n3 || e == n4 || e == n5
 + IN_SET(e, n0, n1, n2, n3, n4, n5)
 |
-- e == n0 || e == n1 || e == n2 || e == n3 || e == n4
+- e@p2 == n0 || e == n1 || e == n2 || e == n3 || e == n4
 + IN_SET(e, n0, n1, n2, n3, n4)
 |
-- e == n0 || e == n1 || e == n2 || e == n3
+- e@p2 == n0 || e == n1 || e == n2 || e == n3
 + IN_SET(e, n0, n1, n2, n3)
 |
-- e == n0 || e == n1 || e == n2
+- e@p2 == n0 || e == n1 || e == n2
 + IN_SET(e, n0, n1, n2)
 |
-- e == n0 || e == n1
+- e@p2 == n0 || e == n1
 + IN_SET(e, n0, n1)
 )

src/analyze/analyze-compare-versions.c

@@ -10,7 +10,7 @@
 int verb_compare_versions(int argc, char *argv[], void *userdata) {
         int r;
 
-        assert(argc == 3 || argc == 4);
+        assert(IN_SET(argc, 3, 4));
         assert(argv);
 
         if (argc == 3) {

src/journal/managed-journal-file.c

@@ -93,10 +93,9 @@ static int managed_journal_file_entry_array_punch_hole(JournalFile *f, uint64_t
         }
 
         if (fallocate(f->fd, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, offset, sz) < 0) {
-                if (ERRNO_IS_NOT_SUPPORTED(errno)) {
-                        log_debug("Hole punching not supported by backing file system, skipping.");
-                        return -EOPNOTSUPP; /* Make recognizable */
-                }
+                if (ERRNO_IS_NOT_SUPPORTED(errno))
+                        return log_debug_errno(SYNTHETIC_ERRNO(EOPNOTSUPP), /* Make recognizable */
+                                               "Hole punching not supported by backing file system, skipping.");
 
                 return log_debug_errno(errno, "Failed to punch hole in entry array of %s: %m", f->path);
         }