summaryrefslogtreecommitdiffstats
path: root/usr.bin/tmux/control.c
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2020-04-13 10:59:58 +0000
committernicm <nicm@openbsd.org>2020-04-13 10:59:58 +0000
commit040343ae18e7aa6a49c6acf6e4add8a0b76f6fff (patch)
tree8ed8ccb63639c656437cc1539d3d2b96b405d399 /usr.bin/tmux/control.c
parentMake struct cmd local to cmd.c and move it out of tmux.h. (diff)
downloadwireguard-openbsd-040343ae18e7aa6a49c6acf6e4add8a0b76f6fff.tar.xz
wireguard-openbsd-040343ae18e7aa6a49c6acf6e4add8a0b76f6fff.zip
Also move cmdq_item and cmdq_list into cmd-queue.c (this is to make its
use more clearly defined and preparation for some future work).
Diffstat (limited to 'usr.bin/tmux/control.c')
-rw-r--r--usr.bin/tmux/control.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/tmux/control.c b/usr.bin/tmux/control.c
index 2a002d1b941..845838ab59d 100644
--- a/usr.bin/tmux/control.c
+++ b/usr.bin/tmux/control.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: control.c,v 1.25 2019/12/12 11:39:56 nicm Exp $ */
+/* $OpenBSD: control.c,v 1.26 2020/04/13 10:59:58 nicm Exp $ */
/*
* Copyright (c) 2012 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -42,7 +42,7 @@ control_write(struct client *c, const char *fmt, ...)
static enum cmd_retval
control_error(struct cmdq_item *item, void *data)
{
- struct client *c = item->client;
+ struct client *c = cmdq_get_client(item);
char *error = data;
cmdq_guard(item, "begin", 1);
@@ -86,7 +86,7 @@ control_callback(__unused struct client *c, __unused const char *path,
break;
case CMD_PARSE_SUCCESS:
item = cmdq_get_command(pr->cmdlist, NULL, NULL, 0);
- item->shared->flags |= CMDQ_SHARED_CONTROL;
+ cmdq_get_shared(item)->flags |= CMDQ_SHARED_CONTROL;
cmdq_append(c, item);
cmd_list_free(pr->cmdlist);
break;