From c6b6ac63ea2e63eb86f63b18a25cda872716ac0b Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 7 Nov 2025 01:27:48 +0900 Subject: [PATCH] resolve: drop unnecessary preparation of empty arrays --- src/resolve/resolved-manager.c | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c index 65439b21f42..64c3a3a3e78 100644 --- a/src/resolve/resolved-manager.c +++ b/src/resolve/resolved-manager.c @@ -2068,30 +2068,6 @@ static int dns_configuration_json_append( assert(configuration); - if (dns_servers) { - r = sd_json_variant_new_array(&dns_servers_json, NULL, 0); - if (r < 0) - return r; - } - - if (search_domains) { - r = sd_json_variant_new_array(&search_domains_json, NULL, 0); - if (r < 0) - return r; - } - - if (current_dns_server) { - r = dns_server_dump_configuration_to_json(current_dns_server, ¤t_dns_server_json); - if (r < 0) - return r; - } - - if (fallback_dns_servers) { - r = sd_json_variant_new_array(&fallback_dns_servers_json, NULL, 0); - if (r < 0) - return r; - } - SET_FOREACH(scope, dns_scopes) { _cleanup_(sd_json_variant_unrefp) sd_json_variant *v = NULL; @@ -2112,8 +2088,6 @@ static int dns_configuration_json_append( LIST_FOREACH(servers, s, dns_servers) { _cleanup_(sd_json_variant_unrefp) sd_json_variant *v = NULL; - assert(dns_servers_json); - r = dns_server_dump_configuration_to_json(s, &v); if (r < 0) return r; @@ -2126,8 +2100,6 @@ static int dns_configuration_json_append( LIST_FOREACH(domains, d, search_domains) { _cleanup_(sd_json_variant_unrefp) sd_json_variant *v = NULL; - assert(search_domains_json); - r = dns_search_domain_dump_to_json(d, &v); if (r < 0) return r; @@ -2140,8 +2112,6 @@ static int dns_configuration_json_append( LIST_FOREACH(servers, s, fallback_dns_servers) { _cleanup_(sd_json_variant_unrefp) sd_json_variant *v = NULL; - assert(fallback_dns_servers_json); - r = dns_server_dump_configuration_to_json(s, &v); if (r < 0) return r; -- 2.47.3