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

sd-json: add json_dispatch_const_filename()

Browse Source 
json_dispatch_const_filename() is to json_dispatch_filename() what json_dispatch_const_path() is to json_dispatch_path().
This commit is contained in:
Lennart Poettering
2025-05-26 12:15:27 +02:00
parent 7f436569c1
commit cb062410ec
2 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -174,23 +174,37 @@ int json_dispatch_path(const char *name, sd_json_variant *variant, sd_json_dispa
return 0;
}
int json_dispatch_filename(const char *name, sd_json_variant *variant, sd_json_dispatch_flags_t flags, void *userdata) {
char **s = ASSERT_PTR(userdata);
const char *n;
int json_dispatch_const_filename(const char *name, sd_json_variant *variant, sd_json_dispatch_flags_t flags, void *userdata) {
const char **n = ASSERT_PTR(userdata);
if (sd_json_variant_is_null(variant)) {
*s = mfree(*s);
*n = NULL;
return 0;
}
if (!sd_json_variant_is_string(variant))
return json_log(variant, flags, SYNTHETIC_ERRNO(EINVAL), "JSON field '%s' is not a string.", strna(name));
n = sd_json_variant_string(variant);
if (!filename_is_valid(n))
const char *filename = sd_json_variant_string(variant);
if (!filename_is_valid(filename))
return json_log(variant, flags, SYNTHETIC_ERRNO(EINVAL), "JSON field '%s' is not a valid file name.", strna(name));
if (free_and_strdup(s, n) < 0)
*n = filename;
return 0;
}
int json_dispatch_filename(const char *name, sd_json_variant *variant, sd_json_dispatch_flags_t flags, void *userdata) {
char **n = ASSERT_PTR(userdata);
const char *filename;
int r;
assert_return(variant, -EINVAL);
r = json_dispatch_const_filename(name, variant, flags, &filename);
if (r < 0)
return r;
if (free_and_strdup(n, filename) < 0)
return json_log_oom(variant, flags);
return 0;

1
src/libsystemd/sd-json/json-util.h
View File

@@ -116,6 +116,7 @@ int json_dispatch_in_addr(const char *name, sd_json_variant *variant, sd_json_di
int json_dispatch_path(const char *name, sd_json_variant *variant, sd_json_dispatch_flags_t flags, void *userdata);
int json_dispatch_const_path(const char *name, sd_json_variant *variant, sd_json_dispatch_flags_t flags, void *userdata);
int json_dispatch_filename(const char *name, sd_json_variant *variant, sd_json_dispatch_flags_t flags, void *userdata);
int json_dispatch_const_filename(const char *name, sd_json_variant *variant, sd_json_dispatch_flags_t flags, void *userdata);
int json_dispatch_pidref(const char *name, sd_json_variant *variant, sd_json_dispatch_flags_t flags, void *userdata);
int json_dispatch_devnum(const char *name, sd_json_variant *variant, sd_json_dispatch_flags_t flags, void *userdata);
int json_dispatch_ifindex(const char *name, sd_json_variant *variant, sd_json_dispatch_flags_t flags, void *userdata);