SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

home: 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-24 21:05:10 +01:00
parent a8a8498ef1
commit 18615041a5
3 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/home/homectl-fido2.c
+5 -5
View File
@@ -89,12 +89,12 @@ static int add_fido2_salt(
return log_error_errno(errno_or_else(EINVAL), "Failed to UNIX hash secret key: %m");
r = sd_json_buildo(&e,
SD_JSON_BUILD_PAIR("credential", SD_JSON_BUILD_BASE64(cid, cid_size)),
SD_JSON_BUILD_PAIR_BASE64("credential", cid, cid_size),
SD_JSON_BUILD_PAIR("salt", JSON_BUILD_IOVEC_BASE64(salt)),
SD_JSON_BUILD_PAIR("hashedPassword", SD_JSON_BUILD_STRING(hashed)),
SD_JSON_BUILD_PAIR("up", SD_JSON_BUILD_BOOLEAN(FLAGS_SET(lock_with, FIDO2ENROLL_UP))),
SD_JSON_BUILD_PAIR("uv", SD_JSON_BUILD_BOOLEAN(FLAGS_SET(lock_with, FIDO2ENROLL_UV))),
SD_JSON_BUILD_PAIR("clientPin", SD_JSON_BUILD_BOOLEAN(FLAGS_SET(lock_with, FIDO2ENROLL_PIN))));
SD_JSON_BUILD_PAIR_STRING("hashedPassword", hashed),
SD_JSON_BUILD_PAIR_BOOLEAN("up", FLAGS_SET(lock_with, FIDO2ENROLL_UP)),
SD_JSON_BUILD_PAIR_BOOLEAN("uv", FLAGS_SET(lock_with, FIDO2ENROLL_UV)),
SD_JSON_BUILD_PAIR_BOOLEAN("clientPin", FLAGS_SET(lock_with, FIDO2ENROLL_PIN)));
if (r < 0)
return log_error_errno(r, "Failed to build FIDO2 salt JSON key object: %m");
src/home/homed-varlink.c
+10 -10
View File
@@ -330,8 +330,8 @@ int vl_method_get_memberships(sd_varlink *link, sd_json_variant *parameters, sd_
if (last) {
r = sd_varlink_notifybo(
link,
SD_JSON_BUILD_PAIR("userName", SD_JSON_BUILD_STRING(last)),
SD_JSON_BUILD_PAIR("groupName", SD_JSON_BUILD_STRING(p.group_name)));
SD_JSON_BUILD_PAIR_STRING("userName", last),
SD_JSON_BUILD_PAIR_STRING("groupName", p.group_name));
if (r < 0)
return r;
}
@@ -342,8 +342,8 @@ int vl_method_get_memberships(sd_varlink *link, sd_json_variant *parameters, sd_
if (last)
return sd_varlink_replybo(
link,
SD_JSON_BUILD_PAIR("userName", SD_JSON_BUILD_STRING(last)),
SD_JSON_BUILD_PAIR("groupName", SD_JSON_BUILD_STRING(p.group_name)));
SD_JSON_BUILD_PAIR_STRING("userName", last),
SD_JSON_BUILD_PAIR_STRING("groupName", p.group_name));
} else {
const char *last = NULL;
@@ -352,8 +352,8 @@ int vl_method_get_memberships(sd_varlink *link, sd_json_variant *parameters, sd_
if (last) {
r = sd_varlink_notifybo(
link,
SD_JSON_BUILD_PAIR("userName", SD_JSON_BUILD_STRING(last)),
SD_JSON_BUILD_PAIR("groupName", SD_JSON_BUILD_STRING(last)));
SD_JSON_BUILD_PAIR_STRING("userName", last),
SD_JSON_BUILD_PAIR_STRING("groupName", last));
if (r < 0)
return r;
@@ -362,8 +362,8 @@ int vl_method_get_memberships(sd_varlink *link, sd_json_variant *parameters, sd_
r = sd_varlink_notifybo(
link,
SD_JSON_BUILD_PAIR("userName", SD_JSON_BUILD_STRING(h->user_name)),
SD_JSON_BUILD_PAIR("groupName", SD_JSON_BUILD_STRING(*j)));
SD_JSON_BUILD_PAIR_STRING("userName", h->user_name),
SD_JSON_BUILD_PAIR_STRING("groupName", *j));
if (r < 0)
return r;
}
@@ -374,8 +374,8 @@ int vl_method_get_memberships(sd_varlink *link, sd_json_variant *parameters, sd_
if (last)
return sd_varlink_replybo(
link,
SD_JSON_BUILD_PAIR("userName", SD_JSON_BUILD_STRING(last)),
SD_JSON_BUILD_PAIR("groupName", SD_JSON_BUILD_STRING(last)));
SD_JSON_BUILD_PAIR_STRING("userName", last),
SD_JSON_BUILD_PAIR_STRING("groupName", last));
}
return sd_varlink_error(link, "io.systemd.UserDatabase.NoRecordFound", NULL);
src/home/user-record-sign.c
+2 -2
View File
@@ -58,8 +58,8 @@ int user_record_sign(UserRecord *ur, EVP_PKEY *private_key, UserRecord **ret) {
&v,
"signature",
SD_JSON_BUILD_ARRAY(
SD_JSON_BUILD_OBJECT(SD_JSON_BUILD_PAIR("data", SD_JSON_BUILD_BASE64(signature, signature_size)),
SD_JSON_BUILD_PAIR("key", SD_JSON_BUILD_STRING(key)))));
SD_JSON_BUILD_OBJECT(SD_JSON_BUILD_PAIR_BASE64("data", signature, signature_size),
SD_JSON_BUILD_PAIR_STRING("key", key))));
if (r < 0)
return r;