Skip to content

Commit

Permalink
CLEANUP: mworker/cli: clean up the mode handling
Browse files Browse the repository at this point in the history
Cleanup the mode handling by refactoring the strings constant
that are written multiple times
  • Loading branch information
wlallemand committed Aug 9, 2024
1 parent 48514c1 commit 75944e2
Showing 1 changed file with 15 additions and 10 deletions.
25 changes: 15 additions & 10 deletions src/cli.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 -;";
Expand All @@ -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:
Expand Down

0 comments on commit 75944e2

Please sign in to comment.