diff options
| author | Tiago Cunha <tcunha@gmx.com> | 2012-07-11 19:34:16 +0000 |
|---|---|---|
| committer | Tiago Cunha <tcunha@gmx.com> | 2012-07-11 19:34:16 +0000 |
| commit | a432fcd30617610b46d65f49b7513bf5da5694de (patch) | |
| tree | b76ab1cefbd5a0020fa789b2c925f31ef9d5796b /cmd-choose-tree.c | |
| parent | 06d27e94b25a49f7a9824e8bfdf6fb04f6baf46e (diff) | |
| download | rtmux-a432fcd30617610b46d65f49b7513bf5da5694de.tar.gz rtmux-a432fcd30617610b46d65f49b7513bf5da5694de.tar.bz2 rtmux-a432fcd30617610b46d65f49b7513bf5da5694de.zip | |
Sync OpenBSD patchset 1150:
xfree is not particularly helpful, remove it. From Thomas Adam.
Diffstat (limited to 'cmd-choose-tree.c')
| -rw-r--r-- | cmd-choose-tree.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cmd-choose-tree.c b/cmd-choose-tree.c index 61c58839..e83a425d 100644 --- a/cmd-choose-tree.c +++ b/cmd-choose-tree.c @@ -19,6 +19,7 @@ #include <sys/types.h> #include <ctype.h> +#include <stdlib.h> #include <string.h> @@ -206,7 +207,7 @@ windows_only: ctx, s2, wm, final_win_template, final_win_action, idx_ses); - xfree(final_win_action); + free(final_win_action); } /* * If we're just drawing windows, don't consider moving on to @@ -215,8 +216,7 @@ windows_only: if (wflag && !sflag) break; } - if (final_win_template != NULL) - xfree(final_win_template); + free(final_win_template); window_choose_ready(wl->window->active, cur_win, cmd_choose_tree_callback, cmd_choose_tree_free); @@ -242,10 +242,10 @@ cmd_choose_tree_free(struct window_choose_data *cdata) cdata->session->references--; cdata->client->references--; - xfree(cdata->ft_template); - xfree(cdata->command); + free(cdata->ft_template); + free(cdata->command); format_free(cdata->ft); - xfree(cdata); + free(cdata); } |