morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 08:25:20 +09:00
Code Issues Packages Projects Releases Wiki Activity

json-util: use JSON_VARIANT_ARRAY_FOREACH where appropriate

Browse Source
This commit is contained in:
Mike Yuan
2025-10-07 16:09:45 +02:00
committed by Lennart Poettering
parent 6870f78dcd
commit 0294c09e5b
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/libsystemd/sd-json/json-util.c
View File

@@ -554,8 +554,8 @@ int json_dispatch_devnum(const char *name, sd_json_variant *variant, sd_json_dis
}
int json_dispatch_strv_environment(const char *name, sd_json_variant *variant, sd_json_dispatch_flags_t flags, void *userdata) {
char ***l = ASSERT_PTR(userdata);
_cleanup_strv_free_ char **n = NULL;
char ***l = userdata;
int r;
if (sd_json_variant_is_null(variant)) {
@@ -566,20 +566,19 @@ int json_dispatch_strv_environment(const char *name, sd_json_variant *variant, s
if (!sd_json_variant_is_array(variant))
return json_log(variant, flags, SYNTHETIC_ERRNO(EINVAL), "JSON field '%s' is not an array.", strna(name));
for (size_t i = 0; i < sd_json_variant_elements(variant); i++) {
sd_json_variant *e;
const char *a;
sd_json_variant *i;
JSON_VARIANT_ARRAY_FOREACH(i, variant) {
const char *e;
e = sd_json_variant_by_index(variant, i);
if (!sd_json_variant_is_string(e))
if (!sd_json_variant_is_string(i))
return json_log(variant, flags, SYNTHETIC_ERRNO(EINVAL), "JSON field '%s' is not an array of strings.", strna(name));
assert_se(a = sd_json_variant_string(e));
e = ASSERT_PTR(sd_json_variant_string(i));
if (!env_assignment_is_valid(e))
return json_log(variant, flags, SYNTHETIC_ERRNO(EINVAL),
"JSON field '%s' contains invalid environment variable assignment.", strna(name));
if (!env_assignment_is_valid(a))
return json_log(variant, flags, SYNTHETIC_ERRNO(EINVAL), "JSON field '%s' is not an array of environment variables.", strna(name));
r = strv_env_replace_strdup(&n, a);
r = strv_env_replace_strdup(&n, e);
if (r < 0)
return json_log_oom(variant, flags);
}