From: Aki Tuomi <aki.tuomi@open-xchange.com>
Date: Thu, 21 Apr 2022 08:51:04 +0000 (+0300)
Subject: lib: net - Change ip to ip_r in net_addr2ip()
X-Git-Tag: 2.4.0~4112
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=67376c74804c033e8137d5465dbd03b441b4ceed;p=thirdparty%2Fdovecot%2Fcore.git

lib: net - Change ip to ip_r in net_addr2ip()

Coding style fix
---

diff --git a/src/lib/net.c b/src/lib/net.c
index 93c7495975..f29a72f318 100644
--- a/src/lib/net.c
+++ b/src/lib/net.c
@@ -980,11 +980,11 @@ static bool net_addr2ip_inet4_fast(const char *addr, struct ip_addr *ip)
 	return TRUE;
 }
 
-int net_addr2ip(const char *addr, struct ip_addr *ip)
+int net_addr2ip(const char *addr, struct ip_addr *ip_r)
 {
 	int ret;
 
-	if (net_addr2ip_inet4_fast(addr, ip))
+	if (net_addr2ip_inet4_fast(addr, ip_r))
 		return 0;
 
 	T_BEGIN {
@@ -1005,7 +1005,7 @@ int net_addr2ip(const char *addr, struct ip_addr *ip)
 			i_assert(res != NULL);
 			const union sockaddr_union *so =
 				(union sockaddr_union *)res->ai_addr;
-			sin_get_ip(so, ip);
+			sin_get_ip(so, ip_r);
 		}
 		if (res != NULL)
 			freeaddrinfo(res);
diff --git a/src/lib/net.h b/src/lib/net.h
index 497ca5fb83..3dc079e75a 100644
--- a/src/lib/net.h
+++ b/src/lib/net.h
@@ -156,7 +156,7 @@ int net_getunixcred(int fd, struct net_unix_cred *cred_r);
 /* Returns ip_addr as string, or "" if ip isn't valid IPv4 or IPv6 address. */
 const char *net_ip2addr(const struct ip_addr *ip);
 /* char* -> struct ip_addr translation. */
-int net_addr2ip(const char *addr, struct ip_addr *ip);
+int net_addr2ip(const char *addr, struct ip_addr *ip_r);
 /* char* -> in_port_t translation */
 int net_str2port(const char *str, in_port_t *port_r);
 /* char* -> in_port_t translation (allows port zero) */