diff options
| author | Thomas Adam <thomas@xteddy.org> | 2020-04-13 14:01:45 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2020-04-13 14:01:45 +0100 |
| commit | 8f2b5d714a9f854c9583cab8bae70a2c7323fa00 (patch) | |
| tree | 4e887ff4a1fcb3703fb0a1fcaa751183cff24c12 /server-client.c | |
| parent | b117c3b81217a11946ac784cfbe2ef1f3725b207 (diff) | |
| parent | 04cdd035250b93b728678d515b69690653dced4e (diff) | |
| download | rtmux-8f2b5d714a9f854c9583cab8bae70a2c7323fa00.tar.gz rtmux-8f2b5d714a9f854c9583cab8bae70a2c7323fa00.tar.bz2 rtmux-8f2b5d714a9f854c9583cab8bae70a2c7323fa00.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'server-client.c')
| -rw-r--r-- | server-client.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/server-client.c b/server-client.c index 76d20ddb..5cb92bd6 100644 --- a/server-client.c +++ b/server-client.c @@ -208,7 +208,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; @@ -353,8 +353,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); @@ -1080,7 +1079,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; @@ -1891,7 +1890,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; |