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

tree-wide: use SD_JSON_BUILD_PAIR_* macros if possible (#39732)

Browse Source
This commit is contained in:
Yu Watanabe
2025-11-15 04:02:51 +09:00
committed by GitHub
parent b8ef90d6fd 887db52362
commit 1569b1e25f
5 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libsystemd/sd-json/sd-json.c
View File

@@ -4148,8 +4148,8 @@ _public_ int sd_json_buildv(sd_json_variant **ret, va_list ap) {
if (dual_timestamp_is_set(ts)) {
r = sd_json_buildo(
&add,
SD_JSON_BUILD_PAIR("realtime", SD_JSON_BUILD_UNSIGNED(ts->realtime)),
SD_JSON_BUILD_PAIR("monotonic", SD_JSON_BUILD_UNSIGNED(ts->monotonic)));
SD_JSON_BUILD_PAIR_UNSIGNED("realtime", ts->realtime),
SD_JSON_BUILD_PAIR_UNSIGNED("monotonic", ts->monotonic));
if (r < 0)
goto finish;
} else

10
src/shared/elf-util.c
View File

@@ -448,7 +448,7 @@ static int parse_metadata(const char *name, sd_json_variant *id_json, Elf *elf,
/* Then we build a new object using the module name as the key, and merge it
* with the previous parses, so that in the end it all fits together in a single
* JSON blob. */
r = sd_json_buildo(&w, SD_JSON_BUILD_PAIR(name, SD_JSON_BUILD_VARIANT(v)));
r = sd_json_buildo(&w, SD_JSON_BUILD_PAIR_VARIANT(name, v));
if (r < 0)
return log_error_errno(r, "Failed to build JSON object: %m");
@@ -513,7 +513,7 @@ static int parse_buildid(Dwfl_Module *mod, Elf *elf, const char *name, StackCont
/* We will later parse package metadata json and pass it to our caller. Prepare the
* build-id in json format too, so that it can be appended and parsed cleanly. It
* will then be added as metadata to the journal message with the stack trace. */
r = sd_json_buildo(&id_json, SD_JSON_BUILD_PAIR("buildId", SD_JSON_BUILD_HEX(id, id_len)));
r = sd_json_buildo(&id_json, SD_JSON_BUILD_PAIR_HEX("buildId", id, id_len));
if (r < 0)
return log_error_errno(r, "json_build on buildId failed: %m");
}
@@ -756,7 +756,7 @@ static int parse_elf(
/* If we found a build-id and nothing else, return at least that. */
if (!package_metadata && id_json) {
r = sd_json_buildo(&package_metadata, SD_JSON_BUILD_PAIR(e, SD_JSON_BUILD_VARIANT(id_json)));
r = sd_json_buildo(&package_metadata, SD_JSON_BUILD_PAIR_VARIANT(e, id_json));
if (r < 0)
return log_warning_errno(r, "Failed to build JSON object: %m");
}
@@ -769,7 +769,7 @@ static int parse_elf(
/* Note that e_type is always DYN for both executables and libraries, so we can't tell them apart from the header,
* but we will search for the PT_INTERP section when parsing the metadata. */
r = sd_json_buildo(&elf_metadata, SD_JSON_BUILD_PAIR("elfType", SD_JSON_BUILD_STRING(elf_type)));
r = sd_json_buildo(&elf_metadata, SD_JSON_BUILD_PAIR_STRING("elfType", elf_type));
if (r < 0)
return log_warning_errno(r, "Failed to build JSON object: %m");
@@ -778,7 +778,7 @@ static int parse_elf(
if (elf_architecture) {
r = sd_json_variant_merge_objectbo(
&elf_metadata,
SD_JSON_BUILD_PAIR("elfArchitecture", SD_JSON_BUILD_STRING(elf_architecture)));
SD_JSON_BUILD_PAIR_STRING("elfArchitecture", elf_architecture));
if (r < 0)
return log_warning_errno(r, "Failed to add elfArchitecture field: %m");

2
src/ssh-generator/ssh-proxy.c
View File

@@ -158,7 +158,7 @@ static int fetch_machine(const char *machine, RuntimeScope scope, sd_json_varian
"io.systemd.Machine.List",
&result,
&error_id,
SD_JSON_BUILD_PAIR("name", SD_JSON_BUILD_STRING(machine)));
SD_JSON_BUILD_PAIR_STRING("name", machine));
if (r < 0)
return log_error_errno(r, "Failed to issue io.systemd.Machine.List() varlink call: %m");
if (error_id) {

4
src/userdb/userdbctl.c
View File

@@ -918,8 +918,8 @@ static int show_membership(const char *user, const char *group, Table *table) {
r = sd_json_buildo(
&v,
SD_JSON_BUILD_PAIR("user", SD_JSON_BUILD_STRING(user)),
SD_JSON_BUILD_PAIR("group", SD_JSON_BUILD_STRING(group)));
SD_JSON_BUILD_PAIR_STRING("user", user),
SD_JSON_BUILD_PAIR_STRING("group", group));
if (r < 0)
return log_error_errno(r, "Failed to build JSON object: %m");

16
src/userdb/userwork.c
View File

@@ -119,8 +119,8 @@ static int build_user_json(sd_varlink *link, UserRecord *ur, sd_json_variant **r
return sd_json_buildo(
ret,
SD_JSON_BUILD_PAIR("record", SD_JSON_BUILD_VARIANT(v)),
SD_JSON_BUILD_PAIR("incomplete", SD_JSON_BUILD_BOOLEAN(stripped->incomplete)));
SD_JSON_BUILD_PAIR_VARIANT("record", v),
SD_JSON_BUILD_PAIR_BOOLEAN("incomplete", stripped->incomplete));
}
static int userdb_flags_from_service(sd_varlink *link, const char *service, UserDBFlags *ret) {
@@ -280,8 +280,8 @@ static int build_group_json(sd_varlink *link, GroupRecord *gr, sd_json_variant *
return sd_json_buildo(
ret,
SD_JSON_BUILD_PAIR("record", SD_JSON_BUILD_VARIANT(v)),
SD_JSON_BUILD_PAIR("incomplete", SD_JSON_BUILD_BOOLEAN(stripped->incomplete)));
SD_JSON_BUILD_PAIR_VARIANT("record", v),
SD_JSON_BUILD_PAIR_BOOLEAN("incomplete", stripped->incomplete));
}
static int vl_method_get_group_record(sd_varlink *link, sd_json_variant *parameters, sd_varlink_method_flags_t flags, void *userdata) {
@@ -437,8 +437,8 @@ static int vl_method_get_memberships(sd_varlink *link, sd_json_variant *paramete
r = sd_varlink_notifybo(
link,
SD_JSON_BUILD_PAIR("userName", SD_JSON_BUILD_STRING(last_user_name)),
SD_JSON_BUILD_PAIR("groupName", SD_JSON_BUILD_STRING(last_group_name)));
SD_JSON_BUILD_PAIR_STRING("userName", last_user_name),
SD_JSON_BUILD_PAIR_STRING("groupName", last_group_name));
if (r < 0)
return r;
}
@@ -456,8 +456,8 @@ static int vl_method_get_memberships(sd_varlink *link, sd_json_variant *paramete
return sd_varlink_replybo(
link,
SD_JSON_BUILD_PAIR("userName", SD_JSON_BUILD_STRING(last_user_name)),
SD_JSON_BUILD_PAIR("groupName", SD_JSON_BUILD_STRING(last_group_name)));
SD_JSON_BUILD_PAIR_STRING("userName", last_user_name),
SD_JSON_BUILD_PAIR_STRING("groupName", last_group_name));
}
static int process_connection(sd_varlink_server *server, int _fd) {