===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server.c,v
retrieving revision 1.184
retrieving revision 1.185
diff -c -r1.184 -r1.185
*** src/usr.bin/tmux/server.c	2019/04/17 14:37:48	1.184
--- src/usr.bin/tmux/server.c	2019/05/20 11:46:06	1.185
***************
*** 1,4 ****
! /* $OpenBSD: server.c,v 1.184 2019/04/17 14:37:48 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: server.c,v 1.185 2019/05/20 11:46:06 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 144,161 ****
  	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,
--- 144,149 ----
***************
*** 217,223 ****
  	}
  
  	if (cause != NULL) {
! 		cmdq_append(c, cmdq_get_callback(server_start_error, cause));
  		c->flags |= CLIENT_EXIT;
  	}
  
--- 205,212 ----
  	}
  
  	if (cause != NULL) {
! 		cmdq_append(c, cmdq_get_error(cause));
! 		free(cause);
  		c->flags |= CLIENT_EXIT;
  	}