From: Simon Horman Date: Sun, 18 Mar 2012 22:24:41 +0000 (+0900) Subject: CLEANUP: Make check_statuses, analyze_statuses and process_chk static X-Git-Tag: v1.5-dev8~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=63a4a822c1133570b863cae033a937ceac66d664;p=thirdparty%2Fhaproxy.git CLEANUP: Make check_statuses, analyze_statuses and process_chk static These symbols are only used inside src/checks.c --- diff --git a/include/proto/checks.h b/include/proto/checks.h index cee6ddac61..69c5d2aadd 100644 --- a/include/proto/checks.h +++ b/include/proto/checks.h @@ -29,7 +29,6 @@ const char *get_check_status_description(short check_status); const char *get_check_status_info(short check_status); void set_server_down(struct server *s); void set_server_up(struct server *s); -struct task *process_chk(struct task *t); int start_checks(); void health_adjust(struct server *s, short status); diff --git a/src/checks.c b/src/checks.c index 010fe6d2fa..f8ad53e160 100644 --- a/src/checks.c +++ b/src/checks.c @@ -51,7 +51,7 @@ static int httpchk_expect(struct server *s, int done); -const struct check_status check_statuses[HCHK_STATUS_SIZE] = { +static const struct check_status check_statuses[HCHK_STATUS_SIZE] = { [HCHK_STATUS_UNKNOWN] = { SRV_CHK_UNKNOWN, "UNK", "Unknown" }, [HCHK_STATUS_INI] = { SRV_CHK_UNKNOWN, "INI", "Initializing" }, [HCHK_STATUS_START] = { /* SPECIAL STATUS*/ }, @@ -78,7 +78,7 @@ const struct check_status check_statuses[HCHK_STATUS_SIZE] = { [HCHK_STATUS_L7STS] = { SRV_CHK_ERROR, "L7STS", "Layer7 wrong status" }, }; -const struct analyze_status analyze_statuses[HANA_STATUS_SIZE] = { /* 0: ignore, 1: error, 2: OK */ +static const struct analyze_status analyze_statuses[HANA_STATUS_SIZE] = { /* 0: ignore, 1: error, 2: OK */ [HANA_STATUS_UNKNOWN] = { "Unknown", { 0, 0 }}, [HANA_STATUS_L4_OK] = { "L4 successful connection", { 2, 0 }}, @@ -1267,7 +1267,7 @@ static struct task *server_warmup(struct task *t) * manages a server health-check. Returns * the time the task accepts to wait, or TIME_ETERNITY for infinity. */ -struct task *process_chk(struct task *t) +static struct task *process_chk(struct task *t) { int attempts = 0; struct server *s = t->context;