From: William Lallemand <wlallemand@haproxy.com>
Date: Fri, 9 Aug 2024 15:41:36 +0000 (+0200)
Subject: CLEANUP: mworker/cli: clean up the mode handling
X-Git-Tag: v3.1-dev6~53
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=75944e266e08687f308dcad42a695ac8d1e03bc4;p=thirdparty%2Fhaproxy.git

CLEANUP: mworker/cli: clean up the mode handling

Cleanup the mode handling by refactoring the strings constant
that are written multiple times
---

diff --git a/src/cli.c b/src/cli.c
index 55965b7103..81422e8607 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -2918,16 +2918,19 @@ int pcli_parse_request(struct stream *s, struct channel *req, char **errmsg, int
 
 		/* the mcli-debug-mode is only sent to the applet of the master */
 		if ((s->pcli_flags & ACCESS_MCLI_DEBUG) && *next_pid <= 0) {
-			ci_insert(req, 0, "mcli-debug-mode on -;", strlen("mcli-debug-mode on -;"));
-			ret += strlen("mcli-debug-mode on -;");
+			const char *cmd = "mcli-debug-mode on -;";
+			ci_insert(req, 0, cmd, strlen(cmd));
+			ret += strlen(cmd);
 		}
 		if (s->pcli_flags & ACCESS_EXPERIMENTAL) {
-			ci_insert(req, 0, "experimental-mode on -;", strlen("experimental-mode on -;"));
-			ret += strlen("experimental-mode on -;");
+			const char *cmd = "experimental-mode on -;";
+			ci_insert(req, 0, cmd, strlen(cmd));
+			ret += strlen(cmd);
 		}
 		if (s->pcli_flags & ACCESS_EXPERT) {
-			ci_insert(req, 0, "expert-mode on -;", strlen("expert-mode on -;"));
-			ret += strlen("expert-mode on -;");
+			const char *cmd = "expert-mode on -;";
+			ci_insert(req, 0, cmd, strlen(cmd));
+			ret += strlen(cmd);
 		}
 		if (s->pcli_flags & ACCESS_MCLI_SEVERITY_STR) {
 			const char *cmd = "set severity-output string -;";
@@ -2943,11 +2946,13 @@ int pcli_parse_request(struct stream *s, struct channel *req, char **errmsg, int
 		if (pcli_has_level(s, ACCESS_LVL_ADMIN)) {
 			goto end;
 		} else if (pcli_has_level(s, ACCESS_LVL_OPER)) {
-			ci_insert(req, 0, "operator -;", strlen("operator -;"));
-			ret += strlen("operator -;");
+			const char *cmd = "operator -;";
+			ci_insert(req, 0, cmd, strlen(cmd));
+			ret += strlen(cmd);
 		} else if (pcli_has_level(s, ACCESS_LVL_USER)) {
-			ci_insert(req, 0, "user -;", strlen("user -;"));
-			ret += strlen("user -;");
+			const char *cmd = "user -;";
+			ci_insert(req, 0, cmd, strlen(cmd));
+			ret += strlen(cmd);
 		}
 	}
 end: