From d56afce6aadc62faa38752560849155d60156ff2 Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Wed, 25 Jan 2023 11:28:46 +0100 Subject: [PATCH 1/2] sysupdate: fix errno check --- src/sysupdate/sysupdate-resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sysupdate/sysupdate-resource.c b/src/sysupdate/sysupdate-resource.c index 04d425299d..e1e260addc 100644 --- a/src/sysupdate/sysupdate-resource.c +++ b/src/sysupdate/sysupdate-resource.c @@ -553,7 +553,7 @@ int resource_resolve_path( r = stat("/run/systemd/volatile-root", &orig_root_stats); if (r < 0) { - if (errno == -ENOENT) /* volatile-root not found */ + if (errno == ENOENT) /* volatile-root not found */ r = get_block_device_harder("/usr/", &d); else return log_error_errno(r, "Failed to stat /run/systemd/volatile-root: %m"); From 19615a650b1d75c2d8d86e02b29891bc525408b7 Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Wed, 25 Jan 2023 11:35:06 +0100 Subject: [PATCH 2/2] coccinelle: skip the empty-to-null transformation on the macro itself Since the empty_to_null() function was "macrofied", we need to use a bit of black magic to make Coccinelle avoid running the transformation on the macro itself. Follow-up to ef2409cbde3. --- coccinelle/empty-to-null.cocci | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/coccinelle/empty-to-null.cocci b/coccinelle/empty-to-null.cocci index 1cc89475a6..82819e9e3c 100644 --- a/coccinelle/empty-to-null.cocci +++ b/coccinelle/empty-to-null.cocci @@ -1,7 +1,11 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ @@ -/* Avoid running this transformation on the empty_to_null function itself */ -position p : script:python() { p[0].current_element != "empty_to_null" }; +/* Avoid running this transformation on the empty_to_null macro itself. + * See the note in strempty.cocci to understand the weird magic below. +*/ +position p : script:python() { + not (p[0].file == "src/basic/string-util.h" and p[0].current_element == "something_else") +}; expression s; @@