From d5ec4bfe8591ffaf5f28311c81f66e011485625c Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Thu, 25 Apr 2019 17:48:16 +0200 Subject: [PATCH] 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. --- include/common/standard.h | 4 ++-- src/standard.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/common/standard.h b/include/common/standard.h index 0900798d4..18459cdc9 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 1035e2027..a81f5a0fc 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;