From: Christopher Faulet <cfaulet@haproxy.com>
Date: Thu, 26 Mar 2020 20:10:03 +0000 (+0100)
Subject: CLEANUP: checks: Don't export anymore init_check and srv_check_healthcheck_port
X-Git-Tag: v2.2-dev7~181
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=31c30fdf1ea82cde9544ceab9cdff71ab1bb200a;p=thirdparty%2Fhaproxy.git

CLEANUP: checks: Don't export anymore init_check and srv_check_healthcheck_port

These functions are no longer called outside the checks.
---

diff --git a/include/proto/checks.h b/include/proto/checks.h
index 2b285f3ce1..37681f1a4d 100644
--- a/include/proto/checks.h
+++ b/include/proto/checks.h
@@ -48,13 +48,11 @@ static inline void health_adjust(struct server *s, short status)
 	HA_SPIN_UNLOCK(SERVER_LOCK, &s->lock);
 }
 
-const char *init_check(struct check *check, int type);
 void free_check(struct check *check);
 
 int init_email_alert(struct mailers *mailers, struct proxy *p, char **err);
 void send_email_alert(struct server *s, int priority, const char *format, ...)
 	__attribute__ ((format(printf, 3, 4)));
-int srv_check_healthcheck_port(struct check *chk);
 
 /* Declared here, but the definitions are in flt_spoe.c */
 int spoe_prepare_healthcheck_request(char **req, int *len);
diff --git a/src/checks.c b/src/checks.c
index b932d25f42..f67e9229b6 100644
--- a/src/checks.c
+++ b/src/checks.c
@@ -70,6 +70,8 @@ static void __event_srv_chk_w(struct conn_stream *cs);
 static int wake_srv_chk(struct conn_stream *cs);
 static void __event_srv_chk_r(struct conn_stream *cs);
 
+static int srv_check_healthcheck_port(struct check *chk);
+
 DECLARE_STATIC_POOL(pool_head_email_alert,   "email_alert",   sizeof(struct email_alert));
 DECLARE_STATIC_POOL(pool_head_tcpcheck_rule, "tcpcheck_rule", sizeof(struct tcpcheck_rule));
 
@@ -3286,7 +3288,7 @@ static int tcpcheck_main(struct check *check)
 	return retcode;
 }
 
-const char *init_check(struct check *check, int type)
+static const char *init_check(struct check *check, int type)
 {
 	check->type = type;
 
@@ -3660,7 +3662,7 @@ void send_email_alert(struct server *s, int level, const char *format, ...)
  *   the port to be used for the health check
  *   0 in case no port could be found for the check
  */
-int srv_check_healthcheck_port(struct check *chk)
+static int srv_check_healthcheck_port(struct check *chk)
 {
 	int i = 0;
 	struct server *srv = NULL;