userdb: prefer using SD_JSON_BUILD_PAIR_* over SD_JSON_BUILD_PAIR(

No functional change, just refactoring.

diff --git a/src/userdb/userdbctl.c b/src/userdb/userdbctl.c
index 823b68e7d9463eb084f9cd3b485b1538d591f749..c0df726fe49fd5a4f38a4f4df72eaef3d185cf9c 100644 (file)
--- a/src/userdb/userdbctl.c
+++ b/src/userdb/userdbctl.c
@@ -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");
 

diff --git a/src/userdb/userwork.c b/src/userdb/userwork.c
index fc698e841da07e31913cace87c2e3cbc0c2ea097..ae927bb52870254a9048f8d07dfe3bcbd993c644 100644 (file)
--- a/src/userdb/userwork.c
+++ b/src/userdb/userwork.c
@@ -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) {