From: Aurelien DARRAGON <adarragon@haproxy.com>
Date: Mon, 22 Apr 2024 08:18:18 +0000 (+0200)
Subject: MINOR: log: make all lf_* sess build helper static
X-Git-Tag: v3.0-dev9~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a1583ec7c789389414b6baf8e29563810a6c9561;p=thirdparty%2Fhaproxy.git

MINOR: log: make all lf_* sess build helper static

There is no need to expose such functions since they are only involved in
the log building process that occurs inside sess_build_logline().

Making functions static and removing their public prototype to ease code
maintenance.
---

diff --git a/include/haproxy/log.h b/include/haproxy/log.h
index fa85cb3107..8d3f72dc9c 100644
--- a/include/haproxy/log.h
+++ b/include/haproxy/log.h
@@ -147,27 +147,6 @@ int get_log_level(const char *lev);
  */
 int get_log_facility(const char *fac);
 
-/*
- * Write a string in the log string
- * Take cares of quote options
- *
- * Return the address of the \0 character, or NULL on error
- */
-char *lf_text_len(char *dst, const char *src, size_t len, size_t size, const struct logformat_node *node);
-
-/*
- * Write a IP address to the log string
- * +X option write in hexadecimal notation, most significant byte on the left
- */
-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 significant byte on the left
- */
-char *lf_port(char *dst, const struct sockaddr *sockaddr, size_t size, const struct logformat_node *node);
-
-
 /*
  * Function to handle log header building (exported for sinks)
  */
diff --git a/src/log.c b/src/log.c
index a521e0a088..f83c38ba2f 100644
--- a/src/log.c
+++ b/src/log.c
@@ -1905,7 +1905,7 @@ static inline char *_lf_quotetext_len(char *dst, const char *src,
  *
  * Return the address of the \0 character, or NULL on error
  */
-char *lf_text_len(char *dst, const char *src, size_t len, size_t size, const struct logformat_node *node)
+static char *lf_text_len(char *dst, const char *src, size_t len, size_t size, const struct logformat_node *node)
 {
 	if ((node->options & LOG_OPT_QUOTE))
 		return _lf_quotetext_len(dst, src, len, size, node);
@@ -1927,7 +1927,7 @@ char *lf_text_len(char *dst, const char *src, size_t len, size_t size, const str
  * Same as lf_text_len() except that it ignores mandatory and quoting options.
  * Quoting is only performed when strictly required by the encoding method.
  */
-char *lf_rawtext_len(char *dst, const char *src, size_t len, size_t size, const struct logformat_node *node)
+static char *lf_rawtext_len(char *dst, const char *src, size_t len, size_t size, const struct logformat_node *node)
 {
 	return _lf_text_len(dst, src, len, size, node);
 }
@@ -1948,7 +1948,7 @@ static inline char *lf_rawtext(char *dst, const char *src, size_t size, const st
  * Write a IP address to the log string
  * +X option write in hexadecimal notation, most significant byte on the left
  */
-char *lf_ip(char *dst, const struct sockaddr *sockaddr, size_t size, const struct logformat_node *node)
+static char *lf_ip(char *dst, const struct sockaddr *sockaddr, size_t size, const struct logformat_node *node)
 {
 	char *ret = dst;
 	int iret;
@@ -2033,7 +2033,7 @@ static inline char *lf_int(char *dst, size_t size, int64_t value,
  * Write a port to the log
  * +X option write in hexadecimal notation, most significant byte on the left
  */
-char *lf_port(char *dst, const struct sockaddr *sockaddr, size_t size, const struct logformat_node *node)
+static char *lf_port(char *dst, const struct sockaddr *sockaddr, size_t size, const struct logformat_node *node)
 {
 	char *ret = dst;
 	int iret;