summaryrefslogtreecommitdiffstats
path: root/cmd-choose-tree.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@openbsd.org>2012-07-10 11:53:01 +0000
committerNicholas Marriott <nicm@openbsd.org>2012-07-10 11:53:01 +0000
commitdf912e3540968a2a0b266e523ecc08bb2dc0ca20 (patch)
treec2c59d025e08aab048b251d1711ed655cdf115f6 /cmd-choose-tree.c
parenta3391692ad5800ca034bbbdcd803924fc4e392ee (diff)
xfree is not particularly helpful, remove it. From Thomas Adam.
Diffstat (limited to 'cmd-choose-tree.c')
-rw-r--r--cmd-choose-tree.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/cmd-choose-tree.c b/cmd-choose-tree.c
index c29b2eab..0389bea3 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);
}