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 3e17733cec3070cb836a85fd10bf84a03b0544bc..419e0b31bb38ff89b7944e8ac76fffcd92b67369 100644 (file)
--- 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 dfac1219a32c9d860b9a6335362c6f6617556aa5..0c5e1f9d334f5873f29f83d88739349caa7050ca 100644 (file)
--- 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;