From: Willy Tarreau <w@1wt.eu>
Date: Wed, 5 Sep 2018 13:23:10 +0000 (+0200)
Subject: CLEANUP: log: make the low_level lf_{ip,port,text,text_len} functions take consts
X-Git-Tag: v1.9-dev2~90
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26ffa8544d70e096d26fd82199dc4837a5c169dc;p=thirdparty%2Fhaproxy.git

CLEANUP: log: make the low_level lf_{ip,port,text,text_len} functions take consts

These ones were abusively relying on variables making it hard to integrate
with const arguments.
---

diff --git a/include/proto/log.h b/include/proto/log.h
index 3e17733cec..419e0b31bb 100644
--- a/include/proto/log.h
+++ b/include/proto/log.h
@@ -150,19 +150,19 @@ int get_log_facility(const char *fac);
  *
  * Return the adress of the \0 character, or NULL on error
  */
-char *lf_text_len(char *dst, const char *src, size_t len, size_t size, struct logformat_node *node);
+char *lf_text_len(char *dst, const const char *src, size_t len, size_t size, const struct logformat_node *node);
 
 /*
  * Write a IP adress to the log string
  * +X option write in hexadecimal notation, most signifant byte on the left
  */
-char *lf_ip(char *dst, struct sockaddr *sockaddr, size_t size, struct logformat_node *node);
+char *lf_ip(char *dst, const struct sockaddr *sockaddr, size_t size, const struct logformat_node *node);
 
 /*
  * Write a port to the log
  * +X option write in hexadecimal notation, most signifant byte on the left
  */
-char *lf_port(char *dst, struct sockaddr *sockaddr, size_t size, struct logformat_node *node);
+char *lf_port(char *dst, const struct sockaddr *sockaddr, size_t size, const struct logformat_node *node);
 
 
 #endif /* _PROTO_LOG_H */
diff --git a/src/log.c b/src/log.c
index dfac1219a3..0c5e1f9d33 100644
--- a/src/log.c
+++ b/src/log.c
@@ -1053,7 +1053,7 @@ static char *lf_encode_chunk(char *start, char *stop,
  *
  * Return the adress of the \0 character, or NULL on error
  */
-char *lf_text_len(char *dst, const char *src, size_t len, size_t size, struct logformat_node *node)
+char *lf_text_len(char *dst, const char *src, size_t len, size_t size, const struct logformat_node *node)
 {
 	if (size < 2)
 		return NULL;
@@ -1097,7 +1097,7 @@ char *lf_text_len(char *dst, const char *src, size_t len, size_t size, struct lo
 	return dst;
 }
 
-static inline char *lf_text(char *dst, const char *src, size_t size, struct logformat_node *node)
+static inline char *lf_text(char *dst, const char *src, size_t size, const struct logformat_node *node)
 {
 	return lf_text_len(dst, src, size, size, node);
 }
@@ -1106,7 +1106,7 @@ static inline char *lf_text(char *dst, const char *src, size_t size, struct logf
  * Write a IP adress to the log string
  * +X option write in hexadecimal notation, most signifant byte on the left
  */
-char *lf_ip(char *dst, struct sockaddr *sockaddr, size_t size, struct logformat_node *node)
+char *lf_ip(char *dst, const struct sockaddr *sockaddr, size_t size, const struct logformat_node *node)
 {
 	char *ret = dst;
 	int iret;
@@ -1131,7 +1131,7 @@ char *lf_ip(char *dst, struct sockaddr *sockaddr, size_t size, struct logformat_
  * Write a port to the log
  * +X option write in hexadecimal notation, most signifant byte on the left
  */
-char *lf_port(char *dst, struct sockaddr *sockaddr, size_t size, struct logformat_node *node)
+char *lf_port(char *dst, const struct sockaddr *sockaddr, size_t size, const struct logformat_node *node)
 {
 	char *ret = dst;
 	int iret;