circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-10-11 13:04:22 +00:00
Code Issues Projects Releases Wiki Activity

More cleanup.

Browse Source
This commit is contained in:
Nicholas Marriott
2026-06-30 22:32:36 +01:00
parent 6d56dd9e7b
commit e935342702
9 changed files with 23 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cmd-confirm-before.c
View File

@@ -52,8 +52,6 @@ const struct cmd_entry cmd_confirm_before_entry = {
struct cmd_confirm_before_data {
struct cmdq_item *item;
struct cmd_parse_tree *tree;
char *file;
int parse_flags;
u_char confirm_key;
int default_yes;
};
@@ -73,7 +71,7 @@ cmd_confirm_before_exec(struct cmd *self, struct cmdq_item *item)
struct client *tc = cmdq_get_target_client(item);
struct cmd_find_state *target = cmdq_get_target(item);
char *new_prompt, *cause = NULL;
const char *confirm_key, *prompt, *cmd, *file;
const char *confirm_key, *prompt, *cmd;
int wait = !args_has(args, 'b'), n;
cdata = xcalloc(1, sizeof *cdata);
@@ -84,10 +82,6 @@ cmd_confirm_before_exec(struct cmd *self, struct cmdq_item *item)
free(cdata);
return (CMD_RETURN_ERROR);
}
cmd_get_source(self, &file, NULL);
if (file != NULL)
cdata->file = xstrdup(file);
cdata->parse_flags = cmd_get_parse_flags(self);
if (wait)
cdata->item = item;
@@ -133,7 +127,6 @@ cmd_confirm_before_callback(struct client *c, void *data, const char *s,
struct cmd_confirm_before_data *cdata = data;
struct cmdq_item *item = cdata->item, *new_item;
struct cmdq_state *cs;
struct cmd_invoke_input ci = { 0 };
int retcode = 1;
if (c->flags & CLIENT_DEAD)
@@ -145,14 +138,12 @@ cmd_confirm_before_callback(struct client *c, void *data, const char *s,
goto out;
retcode = 0;
ci.file = cdata->file;
ci.flags = cdata->parse_flags;
if (item == NULL) {
new_item = cmd_invoke_get(cdata->tree, NULL, &ci);
new_item = cmd_invoke_get(cdata->tree, NULL, NULL);
cmdq_append(c, new_item);
} else {
cs = cmdq_get_state(item);
new_item = cmd_invoke_get(cdata->tree, cs, &ci);
new_item = cmd_invoke_get(cdata->tree, cs, NULL);
cmdq_insert_after(item, new_item);
}
@@ -172,6 +163,5 @@ cmd_confirm_before_free(void *data)
struct cmd_confirm_before_data *cdata = data;
cmd_parse_free(cdata->tree);
free(cdata->file);
free(cdata);
}