===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server.c,v
retrieving revision 1.127
retrieving revision 1.128
diff -c -r1.127 -r1.128
*** src/usr.bin/tmux/server.c	2015/06/05 18:01:12	1.127
--- src/usr.bin/tmux/server.c	2015/06/05 18:18:32	1.128
***************
*** 1,4 ****
! /* $OpenBSD: server.c,v 1.127 2015/06/05 18:01:12 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: server.c,v 1.128 2015/06/05 18:18:32 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 58,64 ****
  void	server_loop(void);
  int	server_should_shutdown(void);
  void	server_send_shutdown(void);
- void	server_clean_dead(void);
  void	server_accept_callback(int, short, void *);
  void	server_signal_callback(int, short, void *);
  void	server_child_signal(void);
--- 58,63 ----
***************
*** 204,210 ****
  	RB_INIT(&all_window_panes);
  	TAILQ_INIT(&clients);
  	RB_INIT(&sessions);
- 	RB_INIT(&dead_sessions);
  	TAILQ_INIT(&session_groups);
  	mode_key_init_trees();
  	key_bindings_init();
--- 203,208 ----
***************
*** 264,271 ****
  
  		server_window_loop();
  		server_client_loop();
- 
- 		server_clean_dead();
  	}
  }
  
--- 262,267 ----
***************
*** 315,335 ****
  
  	RB_FOREACH_SAFE(s, sessions, &sessions, s1)
  		session_destroy(s);
- }
- 
- /* Free dead, unreferenced clients and sessions. */
- void
- server_clean_dead(void)
- {
- 	struct session	*s, *s1;
- 
- 	RB_FOREACH_SAFE(s, sessions, &dead_sessions, s1) {
- 		if (s->references != 0)
- 			continue;
- 		RB_REMOVE(sessions, &dead_sessions, s);
- 		free(s->name);
- 		free(s);
- 	}
  }
  
  /* Update socket execute permissions based on whether sessions are attached. */
--- 311,316 ----