From 865f16d7a08f57b5c2895b99d9d7957415ce14e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 1 Apr 2026 17:56:13 +0200 Subject: [PATCH 1/2] sd-varlink: simplify allocation Suggested in post-merge review. --- src/libsystemd/sd-varlink/sd-varlink.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/libsystemd/sd-varlink/sd-varlink.c b/src/libsystemd/sd-varlink/sd-varlink.c index 4beb785199..90be017705 100644 --- a/src/libsystemd/sd-varlink/sd-varlink.c +++ b/src/libsystemd/sd-varlink/sd-varlink.c @@ -3100,11 +3100,8 @@ _public_ int sd_varlink_set_sentinel(sd_varlink *v, const char *error_id) { -EUCLEAN); char *s = NULL; - if (error_id) { - s = strdup(error_id); - if (!s) - return log_oom_debug(); - } + if (strdup_to(&s, error_id) < 0) + return log_oom_debug(); if (v->sentinel != POINTER_MAX) free(v->sentinel); From 58b0dac9f88fb2b2451b461cb28ff8942c924350 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 4 Apr 2026 22:10:27 +0200 Subject: [PATCH 2/2] meson: fix coccinelle test names fs.name() returns empty if the string ends with "/". --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 5db299a2a7..659aecd421 100644 --- a/meson.build +++ b/meson.build @@ -2998,7 +2998,7 @@ if spatch.found() foreach dir : coccinelle_src_dirs if dir not in coccinelle_exclude test( - 'coccinelle-@0@'.format(fs.name(dir)), + 'coccinelle-@0@'.format(fs.name(dir.strip('/'))), check_coccinelle_sh, args : [meson.project_source_root() / dir, meson.project_source_root() / 'coccinelle'],