diff options
| author |   nicm <nicm@openbsd.org> | 2015-02-05 10:26:29 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2015-02-05 10:26:29 +0000 |
| commit | 413cc750c80a0fd663c8f22921ceac2db6fc9076 (patch) | |
| tree | f2d69e8acedb2d74f8d4f8afafa54e2a6c3c36ec /usr.bin/tmux/cmd-queue.c | |
| parent | typos (diff) | |
| download | wireguard-openbsd-413cc750c80a0fd663c8f22921ceac2db6fc9076.tar.xz wireguard-openbsd-413cc750c80a0fd663c8f22921ceac2db6fc9076.zip | |
There is no need to save the guard state because the function checks it
again anyway.
Diffstat (limited to 'usr.bin/tmux/cmd-queue.c')
| -rw-r--r-- | usr.bin/tmux/cmd-queue.c | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/usr.bin/tmux/cmd-queue.c b/usr.bin/tmux/cmd-queue.c index f9e7a076e69..d357fca1daa 100644 --- a/usr.bin/tmux/cmd-queue.c +++ b/usr.bin/tmux/cmd-queue.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-queue.c,v 1.20 2014/10/27 22:23:47 nicm Exp $ */ +/* $OpenBSD: cmd-queue.c,v 1.21 2015/02/05 10:26:29 nicm Exp $ */ /* * Copyright (c) 2013 Nicholas Marriott <nicm@users.sourceforge.net> @@ -117,20 +117,17 @@ cmdq_error(struct cmd_q *cmdq, const char *fmt, ...) } /* Print a guard line. */ -int +void cmdq_guard(struct cmd_q *cmdq, const char *guard, int flags) { struct client *c = cmdq->client; - if (c == NULL) - return (0); - if (!(c->flags & CLIENT_CONTROL)) - return (0); + if (c == NULL || !(c->flags & CLIENT_CONTROL)) + return; evbuffer_add_printf(c->stdout_data, "%%%s %ld %u %d\n", guard, (long) cmdq->time, cmdq->number, flags); server_push_stdout(c); - return (1); } /* Add command list to queue and begin processing if needed. */ @@ -163,7 +160,7 @@ cmdq_continue(struct cmd_q *cmdq) { struct cmd_q_item *next; enum cmd_retval retval; - int empty, guard, flags; + int empty, flags; char s[1024]; notify_disable(); @@ -188,16 +185,14 @@ cmdq_continue(struct cmd_q *cmdq) cmdq->number++; flags = !!(cmdq->cmd->flags & CMD_CONTROL); - guard = cmdq_guard(cmdq, "begin", flags); + cmdq_guard(cmdq, "begin", flags); retval = cmdq->cmd->entry->exec(cmdq->cmd, cmdq); - if (guard) { - if (retval == CMD_RETURN_ERROR) - cmdq_guard(cmdq, "error", flags); - else - cmdq_guard(cmdq, "end", flags); - } + if (retval == CMD_RETURN_ERROR) + cmdq_guard(cmdq, "error", flags); + else + cmdq_guard(cmdq, "end", flags); if (retval == CMD_RETURN_ERROR) break; |