===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server-client.c,v
retrieving revision 1.283
retrieving revision 1.284
diff -c -r1.283 -r1.284
*** src/usr.bin/tmux/server-client.c	2019/05/12 18:16:33	1.283
--- src/usr.bin/tmux/server-client.c	2019/05/20 11:46:06	1.284
***************
*** 1,4 ****
! /* $OpenBSD: server-client.c,v 1.283 2019/05/12 18:16:33 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: server-client.c,v 1.284 2019/05/20 11:46:06 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 1768,1785 ****
  	return (CMD_RETURN_NORMAL);
  }
  
- /* Show an error message. */
- static enum cmd_retval
- server_client_command_error(struct cmdq_item *item, void *data)
- {
- 	char	*error = data;
- 
- 	cmdq_error(item, "%s", error);
- 	free(error);
- 
- 	return (CMD_RETURN_NORMAL);
- }
- 
  /* Handle command message. */
  static void
  server_client_dispatch_command(struct client *c, struct imsg *imsg)
--- 1768,1773 ----
***************
*** 1827,1833 ****
  	return;
  
  error:
! 	cmdq_append(c, cmdq_get_callback(server_client_command_error, cause));
  
  	if (cmdlist != NULL)
  		cmd_list_free(cmdlist);
--- 1815,1822 ----
  	return;
  
  error:
! 	cmdq_append(c, cmdq_get_error(cause));
! 	free(cause);
  
  	if (cmdlist != NULL)
  		cmd_list_free(cmdlist);