From e128c7fcd8441f3fa885eafc9328f0937cc7384c Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 20 May 2019 11:46:06 +0000
Subject: Replace the various identical error callbacks with a single one in
 cmd-queue.c.

---
 cmd-confirm-before.c | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

(limited to 'cmd-confirm-before.c')

diff --git a/cmd-confirm-before.c b/cmd-confirm-before.c
index 7036d34b..4017a6f9 100644
--- a/cmd-confirm-before.c
+++ b/cmd-confirm-before.c
@@ -82,17 +82,6 @@ cmd_confirm_before_exec(struct cmd *self, struct cmdq_item *item)
 	return (CMD_RETURN_NORMAL);
 }
 
-static enum cmd_retval
-cmd_confirm_before_error(struct cmdq_item *item, void *data)
-{
-	char	*error = data;
-
-	cmdq_error(item, "%s", error);
-	free(error);
-
-	return (CMD_RETURN_NORMAL);
-}
-
 static int
 cmd_confirm_before_callback(struct client *c, void *data, const char *s,
     __unused int done)
@@ -112,11 +101,11 @@ cmd_confirm_before_callback(struct client *c, void *data, const char *s,
 
 	cmdlist = cmd_string_parse(cdata->cmd, NULL, 0, &cause);
 	if (cmdlist == NULL) {
-		if (cause != NULL) {
-			new_item = cmdq_get_callback(cmd_confirm_before_error,
-			    cause);
-		} else
+		if (cause != NULL)
+			new_item = cmdq_get_error(cause);
+		else
 			new_item = NULL;
+		free(cause);
 	} else {
 		new_item = cmdq_get_command(cmdlist, NULL, NULL, 0);
 		cmd_list_free(cmdlist);
-- 
cgit