diff options
| author |   nicm <nicm@openbsd.org> | 2016-10-10 21:51:39 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2016-10-10 21:51:39 +0000 |
| commit | dc1f0f5f6762d20526d28a4fea8505b8be833e1c (patch) | |
| tree | 014a6f76677b5aa63dc7adf2af341d2ac92983f8 /usr.bin/tmux/cmd-join-pane.c | |
| parent | Loads more static, except for cmd-*.c and window-*.c. (diff) | |
| download | wireguard-openbsd-dc1f0f5f6762d20526d28a4fea8505b8be833e1c.tar.xz wireguard-openbsd-dc1f0f5f6762d20526d28a4fea8505b8be833e1c.zip | |
Add static in cmd-* and fix a few other nits.
Diffstat (limited to 'usr.bin/tmux/cmd-join-pane.c')
| -rw-r--r-- | usr.bin/tmux/cmd-join-pane.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/usr.bin/tmux/cmd-join-pane.c b/usr.bin/tmux/cmd-join-pane.c index bc15c65db30..b32d75e1a3d 100644 --- a/usr.bin/tmux/cmd-join-pane.c +++ b/usr.bin/tmux/cmd-join-pane.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-join-pane.c,v 1.25 2016/09/04 17:37:06 nicm Exp $ */ +/* $OpenBSD: cmd-join-pane.c,v 1.26 2016/10/10 21:51:39 nicm Exp $ */ /* * Copyright (c) 2011 George Nachman <tmux@georgester.com> @@ -29,9 +29,7 @@ * Join or move a pane into another (like split/swap/kill). */ -enum cmd_retval cmd_join_pane_exec(struct cmd *, struct cmd_q *); - -enum cmd_retval join_pane(struct cmd *, struct cmd_q *, int); +static enum cmd_retval cmd_join_pane_exec(struct cmd *, struct cmd_q *); const struct cmd_entry cmd_join_pane_entry = { .name = "join-pane", @@ -61,15 +59,9 @@ const struct cmd_entry cmd_move_pane_entry = { .exec = cmd_join_pane_exec }; -enum cmd_retval +static enum cmd_retval cmd_join_pane_exec(struct cmd *self, struct cmd_q *cmdq) { - return (join_pane(self, cmdq, self->entry == &cmd_join_pane_entry)); -} - -enum cmd_retval -join_pane(struct cmd *self, struct cmd_q *cmdq, int not_same_window) -{ struct args *args = self->args; struct session *dst_s; struct winlink *src_wl, *dst_wl; @@ -79,6 +71,12 @@ join_pane(struct cmd *self, struct cmd_q *cmdq, int not_same_window) int size, percentage, dst_idx; enum layout_type type; struct layout_cell *lc; + int not_same_window; + + if (self->entry == &cmd_join_pane_entry) + not_same_window = 1; + else + not_same_window = 0; dst_s = cmdq->state.tflag.s; dst_wl = cmdq->state.tflag.wl; |