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

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2019-05-20 15:02:40 +01:00
parent 3a7e15511b 87d82170a6
commit 98ee93bde3
10 changed files with 74 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
server.c
View File

@ -143,18 +143,6 @@ fail:
return (-1);
}
/* Server error callback. */
static enum cmd_retval
server_start_error(struct cmdq_item *item, void *data)
{
char *error = data;
cmdq_error(item, "%s", error);
free(error);
return (CMD_RETURN_NORMAL);
}
/* Fork new server. */
int
server_start(struct tmuxproc *client, struct event_base *base, int lockfd,
@ -216,7 +204,8 @@ server_start(struct tmuxproc *client, struct event_base *base, int lockfd,
}
if (cause != NULL) {
cmdq_append(c, cmdq_get_callback(server_start_error, cause));
cmdq_append(c, cmdq_get_error(cause));
free(cause);
c->flags |= CLIENT_EXIT;
}