aboutsummaryrefslogtreecommitdiff
path: root/window-copy.c
diff options
context:
space:
mode:
authorTiago Cunha <tcunha@gmx.com>2012-07-11 19:34:16 +0000
committerTiago Cunha <tcunha@gmx.com>2012-07-11 19:34:16 +0000
commita432fcd30617610b46d65f49b7513bf5da5694de (patch)
treeb76ab1cefbd5a0020fa789b2c925f31ef9d5796b /window-copy.c
parent06d27e94b25a49f7a9824e8bfdf6fb04f6baf46e (diff)
downloadrtmux-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 'window-copy.c')
-rw-r--r--window-copy.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/window-copy.c b/window-copy.c
index 7b2a8ae1..35742a6f 100644
--- a/window-copy.c
+++ b/window-copy.c
@@ -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 */