circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-03 22:43:58 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2016-10-16 22:01:14 +01:00
parent d401340c51 d15d54c2c8
commit 1a6e696b08
75 changed files with 1120 additions and 1052 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server-client.c
View File

@ -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);