===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server-client.c,v
retrieving revision 1.231
retrieving revision 1.232
diff -c -r1.231 -r1.232
*** src/usr.bin/tmux/server-client.c	2017/05/10 10:46:59	1.231
--- src/usr.bin/tmux/server-client.c	2017/05/16 12:57:26	1.232
***************
*** 1,4 ****
! /* $OpenBSD: server-client.c,v 1.231 2017/05/10 10:46:59 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: server-client.c,v 1.232 2017/05/16 12:57:26 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 51,57 ****
  
  /* Identify mode callback. */
  static void
! server_client_callback_identify(__unused int fd, __unused short events, void *data)
  {
  	server_client_clear_identify(data, NULL);
  }
--- 51,58 ----
  
  /* Identify mode callback. */
  static void
! server_client_callback_identify(__unused int fd, __unused short events,
!     void *data)
  {
  	server_client_clear_identify(data, NULL);
  }
***************
*** 330,336 ****
  void
  server_client_suspend(struct client *c)
  {
! 	struct session  *s = c->session;
  
  	if (s == NULL || (c->flags & CLIENT_DETACHING))
  		return;
--- 331,337 ----
  void
  server_client_suspend(struct client *c)
  {
! 	struct session	*s = c->session;
  
  	if (s == NULL || (c->flags & CLIENT_DETACHING))
  		return;
***************
*** 344,350 ****
  void
  server_client_detach(struct client *c, enum msgtype msgtype)
  {
! 	struct session  *s = c->session;
  
  	if (s == NULL || (c->flags & CLIENT_DETACHING))
  		return;
--- 345,351 ----
  void
  server_client_detach(struct client *c, enum msgtype msgtype)
  {
! 	struct session	*s = c->session;
  
  	if (s == NULL || (c->flags & CLIENT_DETACHING))
  		return;
***************
*** 1230,1236 ****
  	struct session		*s = c->session;
  	struct tty		*tty = &c->tty;
  	struct window_pane	*wp;
! 	int		 	 needed, flags, masked;
  	struct timeval		 tv = { .tv_usec = 1000 };
  	static struct event	 ev;
  	size_t			 left;
--- 1231,1237 ----
  	struct session		*s = c->session;
  	struct tty		*tty = &c->tty;
  	struct window_pane	*wp;
! 	int			 needed, flags, masked;
  	struct timeval		 tv = { .tv_usec = 1000 };
  	static struct event	 ev;
  	size_t			 left;
***************
*** 1535,1541 ****
  server_client_dispatch_identify(struct client *c, struct imsg *imsg)
  {
  	const char	*data, *home;
! 	size_t	 	 datalen;
  	int		 flags;
  	char		*name;
  
--- 1536,1542 ----
  server_client_dispatch_identify(struct client *c, struct imsg *imsg)
  {
  	const char	*data, *home;
! 	size_t		 datalen;
  	int		 flags;
  	char		*name;
  
***************
*** 1676,1682 ****
  server_client_push_stdout(struct client *c)
  {
  	struct msg_stdout_data data;
! 	size_t                 sent, left;
  
  	left = EVBUFFER_LENGTH(c->stdout_data);
  	while (left != 0) {
--- 1677,1683 ----
  server_client_push_stdout(struct client *c)
  {
  	struct msg_stdout_data data;
! 	size_t		       sent, left;
  
  	left = EVBUFFER_LENGTH(c->stdout_data);
  	while (left != 0) {
***************
*** 1717,1723 ****
  server_client_push_stderr(struct client *c)
  {
  	struct msg_stderr_data data;
! 	size_t                 sent, left;
  
  	if (c->stderr_data == c->stdout_data) {
  		server_client_push_stdout(c);
--- 1718,1724 ----
  server_client_push_stderr(struct client *c)
  {
  	struct msg_stderr_data data;
! 	size_t		       sent, left;
  
  	if (c->stderr_data == c->stdout_data) {
  		server_client_push_stdout(c);