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.

diff --git a/src/shared/dns-configuration.c b/src/shared/dns-configuration.c
index 01b59bbd892b9f13b8f029f2b4a5cceed0b7d406..0ef08667b054f3724a83afc194f138d75c870d49 100644 (file)
--- a/src/shared/dns-configuration.c
+++ b/src/shared/dns-configuration.c
@@ -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,

diff --git a/src/shared/dns-configuration.h b/src/shared/dns-configuration.h
index 40f0a4ad169376c3a916bca029bf0dd7a24de161..a14490f7e5a5a1e61f524941f854f20f8729ecf9 100644 (file)
--- a/src/shared/dns-configuration.h
+++ b/src/shared/dns-configuration.h
@@ -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;