===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/Attic/cmd-unlink-window.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -c -r1.10 -r1.11
*** src/usr.bin/tmux/Attic/cmd-unlink-window.c	2011/01/04 00:42:47	1.10
--- src/usr.bin/tmux/Attic/cmd-unlink-window.c	2012/07/11 07:10:15	1.11
***************
*** 1,4 ****
! /* $OpenBSD: cmd-unlink-window.c,v 1.10 2011/01/04 00:42:47 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-unlink-window.c,v 1.11 2012/07/11 07:10:15 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 24,30 ****
   * Unlink a window, unless it would be destroyed by doing so (only one link).
   */
  
! int	cmd_unlink_window_exec(struct cmd *, struct cmd_ctx *);
  
  const struct cmd_entry cmd_unlink_window_entry = {
  	"unlink-window", "unlinkw",
--- 24,30 ----
   * Unlink a window, unless it would be destroyed by doing so (only one link).
   */
  
! enum cmd_retval	 cmd_unlink_window_exec(struct cmd *, struct cmd_ctx *);
  
  const struct cmd_entry cmd_unlink_window_entry = {
  	"unlink-window", "unlinkw",
***************
*** 36,42 ****
  	cmd_unlink_window_exec
  };
  
! int
  cmd_unlink_window_exec(struct cmd *self, struct cmd_ctx *ctx)
  {
  	struct args		*args = self->args;
--- 36,42 ----
  	cmd_unlink_window_exec
  };
  
! enum cmd_retval
  cmd_unlink_window_exec(struct cmd *self, struct cmd_ctx *ctx)
  {
  	struct args		*args = self->args;
***************
*** 47,53 ****
  	u_int			 references;
  
  	if ((wl = cmd_find_window(ctx, args_get(args, 't'), &s)) == NULL)
! 		return (-1);
  	w = wl->window;
  
  	sg = session_group_find(s);
--- 47,53 ----
  	u_int			 references;
  
  	if ((wl = cmd_find_window(ctx, args_get(args, 't'), &s)) == NULL)
! 		return (CMD_RETURN_ERROR);
  	w = wl->window;
  
  	sg = session_group_find(s);
***************
*** 60,70 ****
  
  	if (!args_has(self->args, 'k') && w->references == references) {
  		ctx->error(ctx, "window is only linked to one session");
! 		return (-1);
  	}
  
  	server_unlink_window(s, wl);
  	recalculate_sizes();
  
! 	return (0);
  }
--- 60,70 ----
  
  	if (!args_has(self->args, 'k') && w->references == references) {
  		ctx->error(ctx, "window is only linked to one session");
! 		return (CMD_RETURN_ERROR);
  	}
  
  	server_unlink_window(s, wl);
  	recalculate_sizes();
  
! 	return (CMD_RETURN_NORMAL);
  }