From: Christopher Faulet <cfaulet@haproxy.com>
Date: Wed, 27 Feb 2019 15:42:58 +0000 (+0100)
Subject: MINOR: stats: Move stuff about the stats status codes in stats files
X-Git-Tag: v2.0-dev2~53
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2b9b6784b9bb70f71f625a4f67e7e009d893a579;p=thirdparty%2Fhaproxy.git

MINOR: stats: Move stuff about the stats status codes in stats files

The status codes definition (STAT_STATUS_*) and their string representation
stat_status_codes) have been moved in stats files. There is no reason to keep
them in proto_http files.
---

diff --git a/include/proto/stats.h b/include/proto/stats.h
index 77edda9b18..01c96cb23a 100644
--- a/include/proto/stats.h
+++ b/include/proto/stats.h
@@ -84,6 +84,8 @@ static inline struct field mkf_str(uint32_t type, const char *value)
 	return f;
 }
 
+extern const char *stat_status_codes[];
+
 /* These two structs contains all field names according with
  * the the number of entries in "enum stat_field" and
  * "enum info_field"
diff --git a/include/types/proto_http.h b/include/types/proto_http.h
index 4af1361450..8fc0feb90e 100644
--- a/include/types/proto_http.h
+++ b/include/types/proto_http.h
@@ -183,20 +183,6 @@ enum rule_result {
 	HTTP_RULE_RES_BADREQ,    /* bad request */
 };
 
-/* status codes available for the stats admin page */
-enum {
-	STAT_STATUS_INIT = 0,
-	STAT_STATUS_DENY,	/* action denied */
-	STAT_STATUS_DONE,	/* the action is successful */
-	STAT_STATUS_ERRP,	/* an error occurred due to invalid values in parameters */
-	STAT_STATUS_EXCD,	/* an error occurred because the buffer couldn't store all data */
-	STAT_STATUS_NONE,	/* nothing happened (no action chosen or servers state didn't change) */
-	STAT_STATUS_PART,	/* the action is partially successful */
-	STAT_STATUS_UNKN,	/* an unknown error occurred, shouldn't happen */
-	STAT_STATUS_IVAL,	/* invalid requests (chunked or invalid post) */
-	STAT_STATUS_SIZE
-};
-
 /* Legacy version of the HTTP/1 message state, used by the channels, should
  * ultimately be removed.
  */
diff --git a/include/types/stats.h b/include/types/stats.h
index ec29c786b0..f416af1de8 100644
--- a/include/types/stats.h
+++ b/include/types/stats.h
@@ -45,6 +45,20 @@ enum {
 	STAT_HTTP_LAST,      /* sending last chunk of response */
 };
 
+/* status codes available for the stats admin page */
+enum {
+	STAT_STATUS_INIT = 0,
+	STAT_STATUS_DENY,	/* action denied */
+	STAT_STATUS_DONE,	/* the action is successful */
+	STAT_STATUS_ERRP,	/* an error occurred due to invalid values in parameters */
+	STAT_STATUS_EXCD,	/* an error occurred because the buffer couldn't store all data */
+	STAT_STATUS_NONE,	/* nothing happened (no action chosen or servers state didn't change) */
+	STAT_STATUS_PART,	/* the action is partially successful */
+	STAT_STATUS_UNKN,	/* an unknown error occurred, shouldn't happen */
+	STAT_STATUS_IVAL,       /* invalid requests (chunked or invalid post) */
+	STAT_STATUS_SIZE
+};
+
 /* HTML form to limit output scope */
 #define STAT_SCOPE_TXT_MAXLEN 20      /* max len for scope substring */
 #define STAT_SCOPE_INPUT_NAME "scope" /* pattern form scope name <input> in html form */
diff --git a/src/proto_http.c b/src/proto_http.c
index 0127e23b59..7bf0e20f28 100644
--- a/src/proto_http.c
+++ b/src/proto_http.c
@@ -75,18 +75,6 @@
 #include <proto/pattern.h>
 #include <proto/vars.h>
 
-/* status codes available for the stats admin page (strictly 4 chars length) */
-const char *stat_status_codes[STAT_STATUS_SIZE] = {
-	[STAT_STATUS_DENY] = "DENY",
-	[STAT_STATUS_DONE] = "DONE",
-	[STAT_STATUS_ERRP] = "ERRP",
-	[STAT_STATUS_EXCD] = "EXCD",
-	[STAT_STATUS_NONE] = "NONE",
-	[STAT_STATUS_PART] = "PART",
-	[STAT_STATUS_UNKN] = "UNKN",
-	[STAT_STATUS_IVAL] = "IVAL",
-};
-
 /* This function handles a server error at the stream interface level. The
  * stream interface is assumed to be already in a closed state. An optional
  * message is copied into the input buffer.
diff --git a/src/stats.c b/src/stats.c
index 6f56353301..7c20453d94 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -77,6 +77,18 @@
 #endif
 
 
+/* status codes available for the stats admin page (strictly 4 chars length) */
+const char *stat_status_codes[STAT_STATUS_SIZE] = {
+	[STAT_STATUS_DENY] = "DENY",
+	[STAT_STATUS_DONE] = "DONE",
+	[STAT_STATUS_ERRP] = "ERRP",
+	[STAT_STATUS_EXCD] = "EXCD",
+	[STAT_STATUS_NONE] = "NONE",
+	[STAT_STATUS_PART] = "PART",
+	[STAT_STATUS_UNKN] = "UNKN",
+	[STAT_STATUS_IVAL] = "IVAL",
+};
+
 /* These are the field names for each INF_* field position. Please pay attention
  * to always use the exact same name except that the strings for new names must
  * be lower case or CamelCase while the enum entries must be upper case.
@@ -294,8 +306,6 @@ static const char *stats_scope_ptr(struct appctx *appctx, struct stream_interfac
  */
 
 
-extern const char *stat_status_codes[];
-
 /* Dumps the stats CSV header to the trash buffer which. The caller is responsible
  * for clearing it if needed.
  * NOTE: Some tools happen to rely on the field position instead of its name,