dns-configuration: make dns_scope_free() static

systemd-resolved already has a dns_scope_free() function in
resolved-dns-scope.c for DnsScope. Since the one in dns-configuration.c
is only used internally, make it static.

This is necessary to allow systemd-resolved to be statically linked
with libsystemd-shared without symbol conflicts.
This commit is contained in:
Yu Watanabe
2026-07-10 16:29:53 +09:00
parent 70cd612797
commit e9dd6f6dc4
2 changed files with 6 additions and 7 deletions
+3 -1
View File
@@ -155,7 +155,7 @@ static int dispatch_search_domain_array(const char *name, sd_json_variant *varia
return 0;
}
DNSScope* dns_scope_free(DNSScope *s) {
static DNSScope* dns_scope_free(DNSScope *s) {
if (!s)
return NULL;
@@ -167,6 +167,8 @@ DNSScope* dns_scope_free(DNSScope *s) {
return mfree(s);
}
DEFINE_TRIVIAL_CLEANUP_FUNC(DNSScope*, dns_scope_free);
DEFINE_PRIVATE_HASH_OPS_WITH_VALUE_DESTRUCTOR(
dns_scope_hash_ops,
void,
+3 -6
View File
@@ -25,6 +25,9 @@ typedef struct SearchDomain {
int ifindex;
} SearchDomain;
SearchDomain* search_domain_free(SearchDomain *d);
DEFINE_TRIVIAL_CLEANUP_FUNC(SearchDomain*, search_domain_free);
typedef struct DNSScope {
char *ifname;
int ifindex;
@@ -34,12 +37,6 @@ typedef struct DNSScope {
char *dns_over_tls_mode_str;
} DNSScope;
DNSScope* dns_scope_free(DNSScope *s);
DEFINE_TRIVIAL_CLEANUP_FUNC(DNSScope*, dns_scope_free);
SearchDomain* search_domain_free(SearchDomain *d);
DEFINE_TRIVIAL_CLEANUP_FUNC(SearchDomain*, search_domain_free);
typedef struct DNSConfiguration {
char *ifname;
int ifindex;