diff options
| author |   nicm <nicm@openbsd.org> | 2020-04-13 10:59:58 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2020-04-13 10:59:58 +0000 |
| commit | 040343ae18e7aa6a49c6acf6e4add8a0b76f6fff (patch) | |
| tree | 8ed8ccb63639c656437cc1539d3d2b96b405d399 /usr.bin/tmux/server-client.c | |
| parent | Make struct cmd local to cmd.c and move it out of tmux.h. (diff) | |
| download | wireguard-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/server-client.c')
| -rw-r--r-- | usr.bin/tmux/server-client.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/usr.bin/tmux/server-client.c b/usr.bin/tmux/server-client.c index 9f1a9a9e404..1e713b7f4ec 100644 --- a/usr.bin/tmux/server-client.c +++ b/usr.bin/tmux/server-client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server-client.c,v 1.315 2020/04/09 13:52:31 nicm Exp $ */ +/* $OpenBSD: server-client.c,v 1.316 2020/04/13 10:59:59 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -210,7 +210,7 @@ server_client_create(int fd) c->fd = -1; c->cwd = NULL; - TAILQ_INIT(&c->queue); + c->queue = cmdq_new(); c->tty.fd = -1; c->title = NULL; @@ -355,8 +355,7 @@ server_client_free(__unused int fd, __unused short events, void *arg) log_debug("free client %p (%d references)", c, c->references); - if (!TAILQ_EMPTY(&c->queue)) - fatalx("queue not empty"); + cmdq_free(c->queue); if (c->references == 0) { free((void *)c->name); @@ -1082,7 +1081,7 @@ server_client_update_latest(struct client *c) static enum cmd_retval server_client_key_callback(struct cmdq_item *item, void *data) { - struct client *c = item->client; + struct client *c = cmdq_get_client(item); struct key_event *event = data; key_code key = event->key; struct mouse_event *m = &event->m; @@ -1893,7 +1892,7 @@ server_client_dispatch(struct imsg *imsg, void *arg) static enum cmd_retval server_client_command_done(struct cmdq_item *item, __unused void *data) { - struct client *c = item->client; + struct client *c = cmdq_get_client(item); if (~c->flags & CLIENT_ATTACHED) c->flags |= CLIENT_EXIT; |