diff options
| author | Thomas Adam <thomas@xteddy.org> | 2016-10-16 22:01:14 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2016-10-16 22:01:14 +0100 |
| commit | 1a6e696b08113ca17ee8e881844167cf94276846 (patch) | |
| tree | 60ecdd8c9e51bff46624e48d9373686b858d2fb1 /server-client.c | |
| parent | d401340c516131ae8e07bfb978b670347486d077 (diff) | |
| parent | d15d54c2c8e6b95695169442eb2a27d814efc078 (diff) | |
| download | rtmux-1a6e696b08113ca17ee8e881844167cf94276846.tar.gz rtmux-1a6e696b08113ca17ee8e881844167cf94276846.tar.bz2 rtmux-1a6e696b08113ca17ee8e881844167cf94276846.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'server-client.c')
| -rw-r--r-- | server-client.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/server-client.c b/server-client.c index 83202a47..4437fe75 100644 --- a/server-client.c +++ b/server-client.c @@ -1262,9 +1262,9 @@ server_client_dispatch(struct imsg *imsg, void *arg) /* Callback when command is done. */ static enum cmd_retval -server_client_command_done(struct cmd_q *cmdq, __unused void *data) +server_client_command_done(struct cmdq_item *item, __unused void *data) { - struct client *c = cmdq->client; + struct client *c = item->client; if (~c->flags & CLIENT_ATTACHED) c->flags |= CLIENT_EXIT; @@ -1273,11 +1273,11 @@ server_client_command_done(struct cmd_q *cmdq, __unused void *data) /* Show an error message. */ static enum cmd_retval -server_client_command_error(struct cmd_q *cmdq, void *data) +server_client_command_error(struct cmdq_item *item, void *data) { char *error = data; - cmdq_error(cmdq, "%s", error); + cmdq_error(item, "%s", error); free(error); return (CMD_RETURN_NORMAL); |