]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
CLEANUP: mworker/cli: clean up the mode handling
authorWilliam Lallemand <wlallemand@haproxy.com>
Fri, 9 Aug 2024 15:41:36 +0000 (17:41 +0200)
committerWilliam Lallemand <wlallemand@haproxy.com>
Fri, 9 Aug 2024 15:47:20 +0000 (17:47 +0200)
Cleanup the mode handling by refactoring the strings constant
that are written multiple times

src/cli.c

index 55965b7103942d7fe2db4f018a89dc11701bde6d..81422e8607f60e850330e6daa5e265f3fe5152e4 100644 (file)
--- 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: