Mass rename struct cmd_q to struct cmdq_item and related.

1 files changed, 14 insertions, 13 deletions

diff --git a/cmd-confirm-before.c b/cmd-confirm-before.c
index 2dd52c81..d468bbc3 100644
--- a/cmd-confirm-before.c
+++ b/cmd-confirm-before.c
@@ -28,10 +28,11 @@
  * Asks for confirmation before executing a command.
  */
 
-static enum cmd_retval	 cmd_confirm_before_exec(struct cmd *, struct cmd_q *);
+static enum cmd_retval	cmd_confirm_before_exec(struct cmd *,
+			    struct cmdq_item *);
 
-static int		 cmd_confirm_before_callback(void *, const char *);
-static void		 cmd_confirm_before_free(void *);
+static int	cmd_confirm_before_callback(void *, const char *);
+static void	cmd_confirm_before_free(void *);
 
 const struct cmd_entry cmd_confirm_before_entry = {
 	.name = "confirm-before",
@@ -52,11 +53,11 @@ struct cmd_confirm_before_data {
 };
 
 static enum cmd_retval
-cmd_confirm_before_exec(struct cmd *self, struct cmd_q *cmdq)
+cmd_confirm_before_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args			*args = self->args;
 	struct cmd_confirm_before_data	*cdata;
-	struct client			*c = cmdq->state.c;
+	struct client			*c = item->state.c;
 	char				*cmd, *copy, *new_prompt, *ptr;
 	const char			*prompt;
 
@@ -84,11 +85,11 @@ cmd_confirm_before_exec(struct cmd *self, struct cmd_q *cmdq)
 }
 
 static enum cmd_retval
-cmd_confirm_before_error(struct cmd_q *cmdq, void *data)
+cmd_confirm_before_error(struct cmdq_item *item, void *data)
 {
 	char	*error = data;
 
-	cmdq_error(cmdq, "%s", error);
+	cmdq_error(item, "%s", error);
 	free(error);
 
 	return (CMD_RETURN_NORMAL);
@@ -100,7 +101,7 @@ cmd_confirm_before_callback(void *data, const char *s)
 	struct cmd_confirm_before_data	*cdata = data;
 	struct client			*c = cdata->client;
 	struct cmd_list			*cmdlist;
-	struct cmd_q			*new_cmdq;
+	struct cmdq_item		*new_item;
 	char				*cause;
 
 	if (c->flags & CLIENT_DEAD)
@@ -113,17 +114,17 @@ cmd_confirm_before_callback(void *data, const char *s)
 
 	if (cmd_string_parse(cdata->cmd, &cmdlist, NULL, 0, &cause) != 0) {
 		if (cause != NULL) {
-			new_cmdq = cmdq_get_callback(cmd_confirm_before_error,
+			new_item = cmdq_get_callback(cmd_confirm_before_error,
 			    cause);
 		} else
-			new_cmdq = NULL;
+			new_item = NULL;
 	} else {
-		new_cmdq = cmdq_get_command(cmdlist, NULL, NULL, 0);
+		new_item = cmdq_get_command(cmdlist, NULL, NULL, 0);
 		cmd_list_free(cmdlist);
 	}
 
-	if (new_cmdq != NULL)
-		cmdq_append(c, new_cmdq);
+	if (new_item != NULL)
+		cmdq_append(c, new_item);
 
 	return (0);
 }