===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-command-prompt.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -c -r1.43 -r1.44
*** src/usr.bin/tmux/cmd-command-prompt.c	2017/04/22 10:22:39	1.43
--- src/usr.bin/tmux/cmd-command-prompt.c	2017/05/17 15:20:23	1.44
***************
*** 1,4 ****
! /* $OpenBSD: cmd-command-prompt.c,v 1.43 2017/04/22 10:22:39 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-command-prompt.c,v 1.44 2017/05/17 15:20:23 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 32,38 ****
  static enum cmd_retval	cmd_command_prompt_exec(struct cmd *,
  			    struct cmdq_item *);
  
! static int	cmd_command_prompt_callback(void *, const char *, int);
  static void	cmd_command_prompt_free(void *);
  
  const struct cmd_entry cmd_command_prompt_entry = {
--- 32,39 ----
  static enum cmd_retval	cmd_command_prompt_exec(struct cmd *,
  			    struct cmdq_item *);
  
! static int	cmd_command_prompt_callback(struct client *, void *,
! 		    const char *, int);
  static void	cmd_command_prompt_free(void *);
  
  const struct cmd_entry cmd_command_prompt_entry = {
***************
*** 48,64 ****
  };
  
  struct cmd_command_prompt_cdata {
! 	struct client	*c;
! 	int		 flags;
  
! 	char		*inputs;
! 	char		*next_input;
  
! 	char		*prompts;
! 	char		*next_prompt;
  
! 	char		*template;
! 	int		 idx;
  };
  
  static enum cmd_retval
--- 49,64 ----
  };
  
  struct cmd_command_prompt_cdata {
! 	int	 flags;
  
! 	char	*inputs;
! 	char	*next_input;
  
! 	char	*prompts;
! 	char	*next_prompt;
  
! 	char	*template;
! 	int	 idx;
  };
  
  static enum cmd_retval
***************
*** 78,84 ****
  		return (CMD_RETURN_NORMAL);
  
  	cdata = xcalloc(1, sizeof *cdata);
- 	cdata->c = c;
  
  	cdata->inputs = NULL;
  	cdata->next_input = NULL;
--- 78,83 ----
***************
*** 142,151 ****
  }
  
  static int
! cmd_command_prompt_callback(void *data, const char *s, int done)
  {
  	struct cmd_command_prompt_cdata	*cdata = data;
- 	struct client			*c = cdata->c;
  	struct cmd_list			*cmdlist;
  	struct cmdq_item		*new_item;
  	char				*cause, *new_template, *prompt, *ptr;
--- 141,150 ----
  }
  
  static int
! cmd_command_prompt_callback(struct client *c, void *data, const char *s,
!     int done)
  {
  	struct cmd_command_prompt_cdata	*cdata = data;
  	struct cmd_list			*cmdlist;
  	struct cmdq_item		*new_item;
  	char				*cause, *new_template, *prompt, *ptr;
***************
*** 193,199 ****
  
  	if (!done)
  		free(new_template);
! 	if (c->prompt_callbackfn != cmd_command_prompt_callback)
  		return (1);
  	return (0);
  }
--- 192,198 ----
  
  	if (!done)
  		free(new_template);
! 	if (c->prompt_inputcb != cmd_command_prompt_callback)
  		return (1);
  	return (0);
  }