mirror of
https://github.com/tmux/tmux.git
synced 2024-12-04 19:58:48 +00:00
Remove some more unused variables, and use RB_FOREACH_SAFE in
key_bindings_unref_table.
This commit is contained in:
parent
2e4503ad4e
commit
f0239a8fe9
@ -73,14 +73,13 @@ cmd_if_shell_exec(struct cmd *self, struct cmd_q *cmdq)
|
||||
struct format_tree *ft;
|
||||
const char *cwd;
|
||||
|
||||
cwd = wp->cwd;
|
||||
|
||||
if (cmdq->client != NULL && cmdq->client->session == NULL)
|
||||
cwd = cmdq->client->cwd;
|
||||
else if (s != NULL)
|
||||
cwd = s->cwd;
|
||||
else
|
||||
cwd = NULL;
|
||||
|
||||
ft = format_create(cmdq, 0);
|
||||
format_defaults(ft, NULL, s, wl, wp);
|
||||
shellcmd = format_expand(ft, args->argv[0]);
|
||||
|
@ -68,7 +68,6 @@ cmd_resize_pane_exec(struct cmd *self, struct cmd_q *cmdq)
|
||||
return (CMD_RETURN_NORMAL);
|
||||
}
|
||||
|
||||
w = wl->window;
|
||||
if (args_has(args, 'Z')) {
|
||||
if (w->flags & WINDOW_ZOOMED)
|
||||
window_unzoom(w);
|
||||
|
1
cmd.c
1
cmd.c
@ -482,7 +482,6 @@ cmd_prepare_state_flag(char c, const char *target, enum cmd_entry_flag flag,
|
||||
CMD_FIND_SESSION, CMD_FIND_QUIET);
|
||||
if (error == 0)
|
||||
break;
|
||||
flag = CMD_WINDOW_INDEX;
|
||||
/* FALLTHROUGH */
|
||||
case CMD_WINDOW:
|
||||
case CMD_WINDOW_CANFAIL:
|
||||
|
@ -68,12 +68,12 @@ void
|
||||
key_bindings_unref_table(struct key_table *table)
|
||||
{
|
||||
struct key_binding *bd;
|
||||
struct key_binding *bd1;
|
||||
|
||||
if (--table->references != 0)
|
||||
return;
|
||||
|
||||
while (!RB_EMPTY(&table->key_bindings)) {
|
||||
bd = RB_ROOT(&table->key_bindings);
|
||||
RB_FOREACH_SAFE(bd, key_bindings, &table->key_bindings, bd1) {
|
||||
RB_REMOVE(key_bindings, &table->key_bindings, bd);
|
||||
cmd_list_free(bd->cmdlist);
|
||||
free(bd);
|
||||
|
Loading…
Reference in New Issue
Block a user