diff options
| author | Thomas Adam <thomas@xteddy.org> | 2017-07-21 12:01:16 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2017-07-21 12:01:16 +0100 |
| commit | e725b96a591ff269ad73946ac16b7f8fd3d0d2d9 (patch) | |
| tree | aca06ded5e5bd6d8f00922e304a0191f4a55c9ae /cmd-split-window.c | |
| parent | acbbc93501eea6732bdca3ca9f39589b867c6b68 (diff) | |
| parent | 11e2af6df76e7384b4dcd20ea3b42ccba8e72310 (diff) | |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-split-window.c')
| -rw-r--r-- | cmd-split-window.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/cmd-split-window.c b/cmd-split-window.c index 35993bfc..c07f30cb 100644 --- a/cmd-split-window.c +++ b/cmd-split-window.c @@ -60,8 +60,8 @@ cmd_split_window_exec(struct cmd *self, struct cmdq_item *item) struct window *w = wl->window; struct window_pane *wp = item->target.wp, *new_wp = NULL; struct environ *env; - const char *cmd, *path, *shell, *template, *cwd, *to_free; - char **argv, *cause, *new_cause, *cp; + const char *cmd, *path, *shell, *template, *cwd; + char **argv, *cause, *new_cause, *cp, *to_free = NULL; u_int hlimit; int argc, size, percentage; enum layout_type type; @@ -85,10 +85,10 @@ cmd_split_window_exec(struct cmd *self, struct cmdq_item *item) argv = args->argv; } - to_free = NULL; if (args_has(args, 'c')) { cwd = args_get(args, 'c'); - to_free = cwd = format_single(item, cwd, c, s, NULL, NULL); + to_free = format_single(item, cwd, c, s, NULL, NULL); + cwd = to_free; } else if (item->client != NULL && item->client->session == NULL) cwd = item->client->cwd; else @@ -171,12 +171,10 @@ cmd_split_window_exec(struct cmd *self, struct cmdq_item *item) } notify_window("window-layout-changed", w); - if (to_free != NULL) - free((void *)to_free); - cmd_find_from_winlink_pane(&fs, wl, new_wp); hooks_insert(s->hooks, item, &fs, "after-split-window"); + free(to_free); return (CMD_RETURN_NORMAL); error: @@ -187,7 +185,6 @@ error: cmdq_error(item, "create pane failed: %s", cause); free(cause); - if (to_free != NULL) - free((void *)to_free); + free(to_free); return (CMD_RETURN_ERROR); } |