===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server.c,v
retrieving revision 1.159
retrieving revision 1.160
diff -c -r1.159 -r1.160
*** src/usr.bin/tmux/server.c	2016/07/07 09:24:09	1.159
--- src/usr.bin/tmux/server.c	2016/10/10 21:29:23	1.160
***************
*** 1,4 ****
! /* $OpenBSD: server.c,v 1.159 2016/07/07 09:24:09 semarie Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: server.c,v 1.160 2016/10/10 21:29:23 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 44,64 ****
  struct clients		 clients;
  
  struct tmuxproc		*server_proc;
! int			 server_fd;
! int			 server_exit;
! struct event		 server_ev_accept;
  
  struct cmd_find_state	 marked_pane;
  
! int	server_create_socket(void);
! int	server_loop(void);
! int	server_should_exit(void);
! void	server_send_exit(void);
! void	server_accept(int, short, void *);
! void	server_signal(int);
! void	server_child_signal(void);
! void	server_child_exited(pid_t, int);
! void	server_child_stopped(pid_t, int);
  
  /* Set marked pane. */
  void
--- 44,63 ----
  struct clients		 clients;
  
  struct tmuxproc		*server_proc;
! static int		 server_fd;
! static int		 server_exit;
! static struct event	 server_ev_accept;
  
  struct cmd_find_state	 marked_pane;
  
! static int	server_create_socket(void);
! static int	server_loop(void);
! static void	server_send_exit(void);
! static void	server_accept(int, short, void *);
! static void	server_signal(int);
! static void	server_child_signal(void);
! static void	server_child_exited(pid_t, int);
! static void	server_child_stopped(pid_t, int);
  
  /* Set marked pane. */
  void
***************
*** 99,105 ****
  }
  
  /* Create server socket. */
! int
  server_create_socket(void)
  {
  	struct sockaddr_un	sa;
--- 98,104 ----
  }
  
  /* Create server socket. */
! static int
  server_create_socket(void)
  {
  	struct sockaddr_un	sa;
***************
*** 187,193 ****
  }
  
  /* Server loop callback. */
! int
  server_loop(void)
  {
  	struct client	*c;
--- 186,192 ----
  }
  
  /* Server loop callback. */
! static int
  server_loop(void)
  {
  	struct client	*c;
***************
*** 216,222 ****
  }
  
  /* Exit the server by killing all clients and windows. */
! void
  server_send_exit(void)
  {
  	struct client	*c, *c1;
--- 215,221 ----
  }
  
  /* Exit the server by killing all clients and windows. */
! static void
  server_send_exit(void)
  {
  	struct client	*c, *c1;
***************
*** 273,279 ****
  }
  
  /* Callback for server socket. */
! void
  server_accept(int fd, short events, __unused void *data)
  {
  	struct sockaddr_storage	sa;
--- 272,278 ----
  }
  
  /* Callback for server socket. */
! static void
  server_accept(int fd, short events, __unused void *data)
  {
  	struct sockaddr_storage	sa;
***************
*** 326,332 ****
  }
  
  /* Signal handler. */
! void
  server_signal(int sig)
  {
  	int	fd;
--- 325,331 ----
  }
  
  /* Signal handler. */
! static void
  server_signal(int sig)
  {
  	int	fd;
***************
*** 353,359 ****
  }
  
  /* Handle SIGCHLD. */
! void
  server_child_signal(void)
  {
  	int	 status;
--- 352,358 ----
  }
  
  /* Handle SIGCHLD. */
! static void
  server_child_signal(void)
  {
  	int	 status;
***************
*** 376,382 ****
  }
  
  /* Handle exited children. */
! void
  server_child_exited(pid_t pid, int status)
  {
  	struct window		*w, *w1;
--- 375,381 ----
  }
  
  /* Handle exited children. */
! static void
  server_child_exited(pid_t pid, int status)
  {
  	struct window		*w, *w1;
***************
*** 402,408 ****
  }
  
  /* Handle stopped children. */
! void
  server_child_stopped(pid_t pid, int status)
  {
  	struct window		*w;
--- 401,407 ----
  }
  
  /* Handle stopped children. */
! static void
  server_child_stopped(pid_t pid, int status)
  {
  	struct window		*w;