From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 10 Jun 2022 20:28:26 +0000 (+0900)
Subject: dns-domain: rename function arguments
X-Git-Tag: v252-rc1~815^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ec4c01475e88c07bd447cee8faab9e0e7900ead5;p=thirdparty%2Fsystemd.git

dns-domain: rename function arguments
---

diff --git a/src/shared/dns-domain.c b/src/shared/dns-domain.c
index 97839e7d73a..20abb84f0fb 100644
--- a/src/shared/dns-domain.c
+++ b/src/shared/dns-domain.c
@@ -1022,7 +1022,7 @@ static bool dns_service_name_label_is_valid(const char *label, size_t n) {
         return dns_service_name_is_valid(s);
 }
 
-int dns_service_split(const char *joined, char **_name, char **_type, char **_domain) {
+int dns_service_split(const char *joined, char **ret_name, char **ret_type, char **ret_domain) {
         _cleanup_free_ char *name = NULL, *type = NULL, *domain = NULL;
         const char *p = joined, *q = NULL, *d = NULL;
         char a[DNS_LABEL_MAX+1], b[DNS_LABEL_MAX+1], c[DNS_LABEL_MAX+1];
@@ -1103,14 +1103,14 @@ finish:
         if (r < 0)
                 return r;
 
-        if (_domain)
-                *_domain = TAKE_PTR(domain);
+        if (ret_domain)
+                *ret_domain = TAKE_PTR(domain);
 
-        if (_type)
-                *_type = TAKE_PTR(type);
+        if (ret_type)
+                *ret_type = TAKE_PTR(type);
 
-        if (_name)
-                *_name = TAKE_PTR(name);
+        if (ret_name)
+                *ret_name = TAKE_PTR(name);
 
         return 0;
 }
diff --git a/src/shared/dns-domain.h b/src/shared/dns-domain.h
index 08cb1cc2aac..5421c60ee7e 100644
--- a/src/shared/dns-domain.h
+++ b/src/shared/dns-domain.h
@@ -88,7 +88,7 @@ bool dnssd_srv_type_is_valid(const char *name);
 bool dns_service_name_is_valid(const char *name);
 
 int dns_service_join(const char *name, const char *type, const char *domain, char **ret);
-int dns_service_split(const char *joined, char **name, char **type, char **domain);
+int dns_service_split(const char *joined, char **ret_name, char **ret_type, char **ret_domain);
 
 int dns_name_suffix(const char *name, unsigned n_labels, const char **ret);
 int dns_name_count_labels(const char *name);