circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

pull/243/head
Thomas Adam 2015-12-15 00:01:08 +00:00
parent bc6137f9e4 d5999f8b5c
commit 6ab17e3e15
3 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd-find.c
View File

@ -49,9 +49,6 @@ int cmd_find_get_pane(struct cmd_find_state *, const char *);
int cmd_find_get_pane_with_session(struct cmd_find_state *, const char *);
int cmd_find_get_pane_with_window(struct cmd_find_state *, const char *);
void cmd_find_clear_state(struct cmd_find_state *, struct cmd_q *, int);
void cmd_find_log_state(const char *, struct cmd_find_state *);
const char *cmd_find_session_table[][2] = {
{ NULL, NULL }
};

20
cmd.c
View File

@ -387,22 +387,6 @@ usage:
return (NULL);
}
static void
cmd_clear_state(struct cmd_state *state)
{
state->c = NULL;
state->tflag.s = NULL;
state->tflag.wl = NULL;
state->tflag.wp = NULL;
state->tflag.idx = -1;
state->sflag.s = NULL;
state->sflag.wl = NULL;
state->sflag.wp = NULL;
state->sflag.idx = -1;
}
static int
cmd_prepare_state_flag(struct cmd_find_state *fs, enum cmd_entry_flag flag,
const char *target, struct cmd_q *cmdq)
@ -492,7 +476,9 @@ cmd_prepare_state(struct cmd *cmd, struct cmd_q *cmdq)
log_debug("preparing state for %s (client %p)", tmp, cmdq->client);
free(tmp);
cmd_clear_state(state);
state->c = NULL;
cmd_find_clear_state(&state->tflag, NULL, 0);
cmd_find_clear_state(&state->sflag, NULL, 0);
flag = cmd->entry->cflag;
if (flag == CMD_NONE) {

3
tmux.h
View File

@ -1766,6 +1766,9 @@ long long args_strtonum(struct args *, u_char, long long, long long,
int cmd_find_target(struct cmd_find_state *, struct cmd_q *,
const char *, enum cmd_find_type, int);
struct client *cmd_find_client(struct cmd_q *, const char *, int);
void cmd_find_clear_state(struct cmd_find_state *, struct cmd_q *,
int);
void cmd_find_log_state(const char *, struct cmd_find_state *);
/* cmd.c */
int cmd_pack_argv(int, char **, char *, size_t);