aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cmd-command-prompt.c19
-rw-r--r--cmd-confirm-before.c19
-rw-r--r--cmd-display-panes.c23
-rw-r--r--cmd-queue.c19
-rw-r--r--menu.c25
-rw-r--r--server-client.c15
-rw-r--r--server.c15
-rw-r--r--tmux.h1
8 files changed, 47 insertions, 89 deletions
diff --git a/cmd-command-prompt.c b/cmd-command-prompt.c
index d7159ad0..a3cc22c8 100644
--- a/cmd-command-prompt.c
+++ b/cmd-command-prompt.c
@@ -129,17 +129,6 @@ cmd_command_prompt_exec(struct cmd *self, struct cmdq_item *item)
return (CMD_RETURN_NORMAL);
}
-static enum cmd_retval
-cmd_command_prompt_error(struct cmdq_item *item, void *data)
-{
- char *error = data;
-
- cmdq_error(item, "%s", error);
- free(error);
-
- return (CMD_RETURN_NORMAL);
-}
-
static int
cmd_command_prompt_callback(struct client *c, void *data, const char *s,
int done)
@@ -177,11 +166,11 @@ cmd_command_prompt_callback(struct client *c, void *data, const char *s,
cmdlist = cmd_string_parse(new_template, NULL, 0, &cause);
if (cmdlist == NULL) {
- if (cause != NULL) {
- new_item = cmdq_get_callback(cmd_command_prompt_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);
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);
diff --git a/cmd-display-panes.c b/cmd-display-panes.c
index 8940b429..6e331ae1 100644
--- a/cmd-display-panes.c
+++ b/cmd-display-panes.c
@@ -182,17 +182,6 @@ cmd_display_panes_draw(struct client *c, struct screen_redraw_ctx *ctx)
}
}
-static enum cmd_retval
-cmd_display_panes_error(struct cmdq_item *item, void *data)
-{
- char *error = data;
-
- cmdq_error(item, "%s", error);
- free(error);
-
- return (CMD_RETURN_NORMAL);
-}
-
static void
cmd_display_panes_free(struct client *c)
{
@@ -226,11 +215,13 @@ cmd_display_panes_key(struct client *c, struct key_event *event)
cmd = cmd_template_replace(cdata->command, expanded, 1);
cmdlist = cmd_string_parse(cmd, NULL, 0, &cause);
- if (cmdlist == NULL && cause != NULL)
- new_item = cmdq_get_callback(cmd_display_panes_error, cause);
- else if (cmdlist == NULL)
- new_item = NULL;
- else {
+ if (cmdlist == NULL) {
+ 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);
}
diff --git a/cmd-queue.c b/cmd-queue.c
index 93b9788e..68bedae8 100644
--- a/cmd-queue.c
+++ b/cmd-queue.c
@@ -329,6 +329,25 @@ cmdq_get_callback1(const char *name, cmdq_cb cb, void *data)
return (item);
}
+/* Generic error callback. */
+static enum cmd_retval
+cmdq_error_callback(struct cmdq_item *item, void *data)
+{
+ char *error = data;
+
+ cmdq_error(item, "%s", error);
+ free(error);
+
+ return (CMD_RETURN_NORMAL);
+}
+
+/* Get an error callback for the command queue. */
+struct cmdq_item *
+cmdq_get_error(const char *error)
+{
+ return (cmdq_get_callback(cmdq_error_callback, xstrdup(error)));
+}
+
/* Fire callback on callback queue. */
static enum cmd_retval
cmdq_fire_callback(struct cmdq_item *item)
diff --git a/menu.c b/menu.c
index 945b62c4..395e1455 100644
--- a/menu.c
+++ b/menu.c
@@ -191,17 +191,6 @@ menu_free_cb(struct client *c)
free(md);
}
-static enum cmd_retval
-menu_error_cb(struct cmdq_item *item, void *data)
-{
- char *error = data;
-
- cmdq_error(item, "%s", error);
- free(error);
-
- return (CMD_RETURN_NORMAL);
-}
-
static int
menu_key_cb(struct client *c, struct key_event *event)
{
@@ -284,12 +273,14 @@ chosen:
return (1);
}
cmdlist = cmd_string_parse(item->command, NULL, 0, &cause);
- if (cmdlist == NULL && cause != NULL)
- new_item = cmdq_get_callback(menu_error_cb, cause);
- else if (cmdlist == NULL)
- new_item = NULL;
- else {
- new_item = cmdq_get_command(cmdlist, &md->fs, NULL, 0);
+ if (cmdlist == NULL) {
+ 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);
}
if (new_item != NULL) {
diff --git a/server-client.c b/server-client.c
index c7a0acc9..e71cce15 100644
--- a/server-client.c
+++ b/server-client.c
@@ -1768,18 +1768,6 @@ server_client_command_done(struct cmdq_item *item, __unused void *data)
return (CMD_RETURN_NORMAL);
}
-/* Show an error message. */
-static enum cmd_retval
-server_client_command_error(struct cmdq_item *item, void *data)
-{
- char *error = data;
-
- cmdq_error(item, "%s", error);
- free(error);
-
- return (CMD_RETURN_NORMAL);
-}
-
/* Handle command message. */
static void
server_client_dispatch_command(struct client *c, struct imsg *imsg)
@@ -1827,7 +1815,8 @@ server_client_dispatch_command(struct client *c, struct imsg *imsg)
return;
error:
- cmdq_append(c, cmdq_get_callback(server_client_command_error, cause));
+ cmdq_append(c, cmdq_get_error(cause));
+ free(cause);
if (cmdlist != NULL)
cmd_list_free(cmdlist);
diff --git a/server.c b/server.c
index 3c54f453..18818c38 100644
--- a/server.c
+++ b/server.c
@@ -144,18 +144,6 @@ fail:
return (-1);
}
-/* Server error callback. */
-static enum cmd_retval
-server_start_error(struct cmdq_item *item, void *data)
-{
- char *error = data;
-
- cmdq_error(item, "%s", error);
- free(error);
-
- return (CMD_RETURN_NORMAL);
-}
-
/* Fork new server. */
int
server_start(struct tmuxproc *client, struct event_base *base, int lockfd,
@@ -217,7 +205,8 @@ server_start(struct tmuxproc *client, struct event_base *base, int lockfd,
}
if (cause != NULL) {
- cmdq_append(c, cmdq_get_callback(server_start_error, cause));
+ cmdq_append(c, cmdq_get_error(cause));
+ free(cause);
c->flags |= CLIENT_EXIT;
}
diff --git a/tmux.h b/tmux.h
index 4317bf0b..c87c797c 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1983,6 +1983,7 @@ struct cmdq_item *cmdq_get_command(struct cmd_list *, struct cmd_find_state *,
struct mouse_event *, int);
#define cmdq_get_callback(cb, data) cmdq_get_callback1(#cb, cb, data)
struct cmdq_item *cmdq_get_callback1(const char *, cmdq_cb, void *);
+struct cmdq_item *cmdq_get_error(const char *);
void cmdq_insert_after(struct cmdq_item *, struct cmdq_item *);
void cmdq_append(struct client *, struct cmdq_item *);
void cmdq_insert_hook(struct session *, struct cmdq_item *,
generated by cgit (git 2.34.1) at 2025-04-28 18:15:10 +0000