Rename cmd_q dead flag to a general flags bitmask (will be more flags…

… later).
ThomasAdam · Sep 16, 2015 · a4b4b29 · a4b4b29
1 parent 16ee4de
commit a4b4b29
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/cmd-if-shell.c b/cmd-if-shell.c
@@ -143,7 +143,7 @@ cmd_if_shell_callback(struct job *job)
 	struct cmd_list			*cmdlist;
 	char				*cause, *cmd;
 
-	if (cmdq->dead)
+	if (cmdq->flags & CMD_Q_DEAD)
 		return;
 
 	if (!WIFEXITED(job->status) || WEXITSTATUS(job->status) != 0)

diff --git a/cmd-queue.c b/cmd-queue.c
@@ -35,7 +35,7 @@ cmdq_new(struct client *c)
 
 	cmdq = xcalloc(1, sizeof *cmdq);
 	cmdq->references = 1;
-	cmdq->dead = 0;
+	cmdq->flags = 0;
 
 	cmdq->client = c;
 	cmdq->client_exit = -1;
@@ -51,8 +51,11 @@ cmdq_new(struct client *c)
 int
 cmdq_free(struct cmd_q *cmdq)
 {
-	if (--cmdq->references != 0)
-		return (cmdq->dead);
+	if (--cmdq->references != 0) {
+		if (cmdq->flags & CMD_Q_DEAD)
+			return (1);
+		return (0);
+	}
 
 	cmdq_flush(cmdq);
 	free(cmdq);

diff --git a/cmd-run-shell.c b/cmd-run-shell.c
@@ -131,7 +131,7 @@ cmd_run_shell_callback(struct job *job)
 	int				 retcode;
 	u_int				 lines;
 
-	if (cmdq->dead)
+	if (cmdq->flags & CMD_Q_DEAD)
 		return;
 	cmd = cdata->cmd;
 

diff --git a/server-client.c b/server-client.c
@@ -214,7 +214,7 @@ server_client_lost(struct client *c)
 	free(c->prompt_string);
 	free(c->prompt_buffer);
 
-	c->cmdq->dead = 1;
+	c->cmdq->flags |= CMD_Q_DEAD;
 	cmdq_free(c->cmdq);
 	c->cmdq = NULL;
 

diff --git a/tmux.h b/tmux.h
@@ -1305,7 +1305,8 @@ TAILQ_HEAD(cmd_q_items, cmd_q_item);
 /* Command queue. */
 struct cmd_q {
 	int			 references;
-	int			 dead;
+	int			 flags;
+#define CMD_Q_DEAD 0x1
 
 	struct client		*client;
 	int			 client_exit;