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

userdb: prefer using SD_JSON_BUILD_PAIR_* over SD_JSON_BUILD_PAIR(

Browse Source 
No functional change, just refactoring.
This commit is contained in:
Jelle van der Waa
2025-11-14 13:56:22 +01:00
parent 8ef5e56f97
commit 7e5d718046
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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) {