From: William Lallemand <wlallemand@haproxy.com>
Date: Tue, 11 Dec 2018 15:10:58 +0000 (+0100)
Subject: MINOR: cli: use pcli_flags for prompt activation
X-Git-Tag: v1.9-dev11~108
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=459e18e9e716c3f9718db37a4467d2752b04c164;p=thirdparty%2Fhaproxy.git

MINOR: cli: use pcli_flags for prompt activation

Instead of using a variable to activate the prompt, we just use a flag.
---

diff --git a/include/types/stream.h b/include/types/stream.h
index 8eb51158f9..6dee432144 100644
--- a/include/types/stream.h
+++ b/include/types/stream.h
@@ -163,7 +163,6 @@ struct stream {
 			  struct stream_interface *si);
 
 	int pcli_next_pid;                      /* next target PID to use for the CLI proxy */
-	int pcli_prompt;                        /* is there a prompt ?! */
 	int pcli_flags;                         /* flags for CLI proxy */
 
 	char *unique_id;                        /* custom unique ID */
diff --git a/src/cli.c b/src/cli.c
index 9d210dd360..c41a8b5a1f 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -1658,7 +1658,7 @@ void pcli_write_prompt(struct stream *s)
 	struct buffer *msg = get_trash_chunk();
 	struct channel *oc = si_oc(&s->si[0]);
 
-	if (!s->pcli_prompt)
+	if (!(s->pcli_flags & APPCTX_CLI_ST1_PROMPT))
 		return;
 
 	if (s->pcli_flags & APPCTX_CLI_ST1_PAYLOAD) {
@@ -1790,7 +1790,7 @@ int pcli_find_and_exec_kw(struct stream *s, char **args, int argl, char **errmsg
 			*next_pid = target_pid;
 		return 1;
 	} else if (!strcmp("prompt", args[0])) {
-		s->pcli_prompt ^= 1;
+		s->pcli_flags ^= APPCTX_CLI_ST1_PROMPT;
 		return argl; /* return the number of elements in the array */
 
 	} else if (!strcmp("quit", args[0])) {
diff --git a/src/stream.c b/src/stream.c
index 24df70af35..d79f86c727 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -201,7 +201,6 @@ struct stream *stream_new(struct session *sess, enum obj_type *origin)
 
 	s->flags |= SF_INITIALIZED;
 	s->pcli_next_pid = 0;
-	s->pcli_prompt = 0;
 	s->pcli_flags = 0;
 	s->unique_id = NULL;