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

resolvectl: merge JSON error fields

Browse Source 
Follow-up for: 32b3aabfe7
This commit is contained in:
dongshengyuan
2026-08-19 02:31:39 +09:00
committed by Yu Watanabe
parent 57c4a1ea32
commit 3e55065ccf
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resolve/resolvectl.c
+5 -9
View File
@@ -288,20 +288,16 @@ static void print_ifindex_comment(int printed_so_far, int ifindex) {
}
static int dump_resolve_error_json(const char *name, const char *error_id, sd_json_variant *parameters, int ret) {
_cleanup_(sd_json_variant_unrefp) sd_json_variant *j = NULL;
int r;
assert(name);
assert(!isempty(error_id));
if (parameters)
j = sd_json_variant_ref(parameters);
r = sd_json_variant_set_field_string(&j, "name", name);
if (r < 0)
return r;
r = sd_json_variant_set_field_string(&j, "error", error_id);
_cleanup_(sd_json_variant_unrefp) sd_json_variant *j = sd_json_variant_ref(parameters);
r = sd_json_variant_merge_objectbo(
&j,
SD_JSON_BUILD_PAIR_STRING("name", name),
SD_JSON_BUILD_PAIR_STRING("error", error_id));
if (r < 0)
return r;