summaryrefslogtreecommitdiff
path: root/usr.bin/tmux/window-copy.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@cvs.openbsd.org>2012-07-10 11:53:02 +0000
committerNicholas Marriott <nicm@cvs.openbsd.org>2012-07-10 11:53:02 +0000
commit0ed606e0c38d62777110f204c4bccdfd890a34ea (patch)
tree48bd8518754ed4e6522fdbc3be9885313ad0a227 /usr.bin/tmux/window-copy.c
parent8a386e18f9ebed887bd888ffd5bede8694b2ef62 (diff)
xfree is not particularly helpful, remove it. From Thomas Adam.
Diffstat (limited to 'usr.bin/tmux/window-copy.c')
-rw-r--r--usr.bin/tmux/window-copy.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/usr.bin/tmux/window-copy.c b/usr.bin/tmux/window-copy.c
index 825a568c50d..40c5fe0d903 100644
--- a/usr.bin/tmux/window-copy.c
+++ b/usr.bin/tmux/window-copy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: window-copy.c,v 1.80 2012/04/01 20:53:47 nicm Exp $ */
+/* $OpenBSD: window-copy.c,v 1.81 2012/07/10 11:53:01 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -240,17 +240,16 @@ window_copy_free(struct window_pane *wp)
if (wp->fd != -1)
bufferevent_enable(wp->event, EV_READ|EV_WRITE);
- if (data->searchstr != NULL)
- xfree(data->searchstr);
- xfree(data->inputstr);
+ free(data->searchstr);
+ free(data->inputstr);
if (data->backing != &wp->base) {
screen_free(data->backing);
- xfree(data->backing);
+ free(data->backing);
}
screen_free(&data->screen);
- xfree(data);
+ free(data);
}
void
@@ -1379,7 +1378,7 @@ window_copy_copy_selection(struct window_pane *wp, int idx)
/* Don't bother if no data. */
if (off == 0) {
- xfree(buf);
+ free(buf);
return;
}
off--; /* remove final \n */