===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-display-message.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -c -r1.14 -r1.15
*** src/usr.bin/tmux/cmd-display-message.c	2012/07/10 11:53:01	1.14
--- src/usr.bin/tmux/cmd-display-message.c	2012/07/11 07:10:15	1.15
***************
*** 1,4 ****
! /* $OpenBSD: cmd-display-message.c,v 1.14 2012/07/10 11:53:01 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
--- 1,4 ----
! /* $OpenBSD: cmd-display-message.c,v 1.15 2012/07/11 07:10:15 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
***************
*** 27,33 ****
   * Displays a message in the status line.
   */
  
! int	cmd_display_message_exec(struct cmd *, struct cmd_ctx *);
  
  const struct cmd_entry cmd_display_message_entry = {
  	"display-message", "display",
--- 27,33 ----
   * Displays a message in the status line.
   */
  
! enum cmd_retval	 cmd_display_message_exec(struct cmd *, struct cmd_ctx *);
  
  const struct cmd_entry cmd_display_message_entry = {
  	"display-message", "display",
***************
*** 39,45 ****
  	cmd_display_message_exec
  };
  
! int
  cmd_display_message_exec(struct cmd *self, struct cmd_ctx *ctx)
  {
  	struct args		*args = self->args;
--- 39,45 ----
  	cmd_display_message_exec
  };
  
! enum cmd_retval
  cmd_display_message_exec(struct cmd *self, struct cmd_ctx *ctx)
  {
  	struct args		*args = self->args;
***************
*** 55,75 ****
  	size_t			 len;
  
  	if ((c = cmd_find_client(ctx, args_get(args, 'c'))) == NULL)
! 		return (-1);
  
  	if (args_has(args, 't')) {
  		wl = cmd_find_pane(ctx, args_get(args, 't'), &s, &wp);
  		if (wl == NULL)
! 			return (-1);
  	} else {
  		wl = cmd_find_pane(ctx, NULL, &s, &wp);
  		if (wl == NULL)
! 			return (-1);
  	}
  
  	if (args_has(args, 'F') && args->argc != 0) {
  		ctx->error(ctx, "only one of -F or argument must be given");
! 		return (-1);
  	}
  
  	template = args_get(args, 'F');
--- 55,75 ----
  	size_t			 len;
  
  	if ((c = cmd_find_client(ctx, args_get(args, 'c'))) == NULL)
! 		return (CMD_RETURN_ERROR);
  
  	if (args_has(args, 't')) {
  		wl = cmd_find_pane(ctx, args_get(args, 't'), &s, &wp);
  		if (wl == NULL)
! 			return (CMD_RETURN_ERROR);
  	} else {
  		wl = cmd_find_pane(ctx, NULL, &s, &wp);
  		if (wl == NULL)
! 			return (CMD_RETURN_ERROR);
  	}
  
  	if (args_has(args, 'F') && args->argc != 0) {
  		ctx->error(ctx, "only one of -F or argument must be given");
! 		return (CMD_RETURN_ERROR);
  	}
  
  	template = args_get(args, 'F');
***************
*** 96,100 ****
  
  	free(msg);
  	format_free(ft);
! 	return (0);
  }
--- 96,100 ----
  
  	free(msg);
  	format_free(ft);
! 	return (CMD_RETURN_NORMAL);
  }