From: Willy Tarreau <w@1wt.eu>
Date: Thu, 25 Apr 2019 15:48:16 +0000 (+0200)
Subject: CLEANUP: standard: use proper const to addr_to_str() and port_to_str()
X-Git-Tag: v2.0-dev3~168
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5ec4bfe8591ffaf5f28311c81f66e011485625c;p=thirdparty%2Fhaproxy.git

CLEANUP: standard: use proper const to addr_to_str() and port_to_str()

The input parameter was not marked const, making it painful for some calls.
---

diff --git a/include/common/standard.h b/include/common/standard.h
index 0900798d48..18459cdc9a 100644
--- a/include/common/standard.h
+++ b/include/common/standard.h
@@ -446,7 +446,7 @@ int url2sa(const char *url, int ulen, struct sockaddr_storage *addr, struct spli
  * is returned upon error, with errno set. AF_INET, AF_INET6 and AF_UNIX are
  * supported.
  */
-int addr_to_str(struct sockaddr_storage *addr, char *str, int size);
+int addr_to_str(const struct sockaddr_storage *addr, char *str, int size);
 
 /* Tries to convert a sockaddr_storage port to text form. Upon success, the
  * address family is returned so that it's easy for the caller to adapt to the
@@ -454,7 +454,7 @@ int addr_to_str(struct sockaddr_storage *addr, char *str, int size);
  * is returned upon error, with errno set. AF_INET, AF_INET6 and AF_UNIX are
  * supported.
  */
-int port_to_str(struct sockaddr_storage *addr, char *str, int size);
+int port_to_str(const struct sockaddr_storage *addr, char *str, int size);
 
 /* check if the given address is local to the system or not. It will return
  * -1 when it's not possible to know, 0 when the address is not local, 1 when
diff --git a/src/standard.c b/src/standard.c
index 1035e20272..a81f5a0fca 100644
--- a/src/standard.c
+++ b/src/standard.c
@@ -1427,10 +1427,10 @@ int url2sa(const char *url, int ulen, struct sockaddr_storage *addr, struct spli
  * is returned upon error, with errno set. AF_INET, AF_INET6 and AF_UNIX are
  * supported.
  */
-int addr_to_str(struct sockaddr_storage *addr, char *str, int size)
+int addr_to_str(const struct sockaddr_storage *addr, char *str, int size)
 {
 
-	void *ptr;
+	const void *ptr;
 
 	if (size < 5)
 		return 0;
@@ -1463,7 +1463,7 @@ int addr_to_str(struct sockaddr_storage *addr, char *str, int size)
  * is returned upon error, with errno set. AF_INET, AF_INET6 and AF_UNIX are
  * supported.
  */
-int port_to_str(struct sockaddr_storage *addr, char *str, int size)
+int port_to_str(const struct sockaddr_storage *addr, char *str, int size)
 {
 
 	uint16_t port;