From 4c7f7f4b229555b1ccf9f4cf08921ad388513afb Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Mon, 30 May 2022 16:50:57 +0200 Subject: [PATCH 1/3] analyze: use IN_SET() in one more place --- src/analyze/analyze-compare-versions.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/analyze/analyze-compare-versions.c b/src/analyze/analyze-compare-versions.c index 9d9f7ed3cb..202b8a7d09 100644 --- a/src/analyze/analyze-compare-versions.c +++ b/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) { From 81aa8d4130f8064e972dd607c2e29d7339ba26e6 Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Mon, 30 May 2022 16:51:48 +0200 Subject: [PATCH 2/3] journal: return & log in one statement --- src/journal/managed-journal-file.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/journal/managed-journal-file.c b/src/journal/managed-journal-file.c index 52aee7be98..5c34d14ddc 100644 --- a/src/journal/managed-journal-file.c +++ b/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); } From a0aca8821c622477d69ccca362ddb473d599636a Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Mon, 30 May 2022 18:17:11 +0200 Subject: [PATCH 3/3] coccinelle: don't try to use IN_SET() in assert_cc() Since assert_cc() requires an integral constant expression. --- coccinelle/in_set.cocci | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/coccinelle/in_set.cocci b/coccinelle/in_set.cocci index 8be786dc2d..a3b02f9609 100644 --- a/coccinelle/in_set.cocci +++ b/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) )