]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
core: Make sure we don't clobber return argument on failure
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Thu, 16 Oct 2025 07:32:44 +0000 (09:32 +0200)
committerLuca Boccassi <luca.boccassi@gmail.com>
Thu, 16 Oct 2025 10:06:43 +0000 (11:06 +0100)
As documented in the coding style, let's make sure we follow it.

src/core/varlink-common.c

index eb3fafa2fa96ba7e82f89851c3ee246ab30bd3cb..6a1e6af9ae9ed9bd7038f93deb144bb093b737fe 100644 (file)
@@ -36,6 +36,7 @@ int rlimit_build_json(sd_json_variant **ret, const char *name, void *userdata) {
 }
 
 int rlimit_table_build_json(sd_json_variant **ret, const char *name, void *userdata) {
+        _cleanup_(sd_json_variant_unrefp) sd_json_variant *v = NULL;
         struct rlimit **rl = ASSERT_PTR(userdata);
         int r;
 
@@ -43,11 +44,13 @@ int rlimit_table_build_json(sd_json_variant **ret, const char *name, void *userd
 
         for (int i = 0; i < _RLIMIT_MAX; i++) {
                 r = sd_json_variant_merge_objectbo(
-                        ret,
+                        &v,
                         JSON_BUILD_PAIR_CALLBACK_NON_NULL(rlimit_to_string(i), rlimit_build_json, rl[i]));
                 if (r < 0)
                         return r;
         }
 
+        *ret = TAKE_PTR(v);
+
         return 0;
 }