diff options
| author | nicm <nicm> | 2020-04-13 10:59:58 +0000 |
|---|---|---|
| committer | nicm <nicm> | 2020-04-13 10:59:58 +0000 |
| commit | 04cdd035250b93b728678d515b69690653dced4e (patch) | |
| tree | 34edc5f4affb9a640a95c7d531eb06770b6ea3c9 /server-client.c | |
| parent | c20eb0c0ae3347c768894a6355adfd7ebae6f2f3 (diff) | |
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 '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 b6ce94a9..12a65af2 100644 --- a/server-client.c +++ b/server-client.c @@ -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; |