===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/window-copy.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- src/usr.bin/tmux/window-copy.c	2012/04/01 20:53:47	1.80
+++ src/usr.bin/tmux/window-copy.c	2012/07/10 11:53:01	1.81
@@ -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 @@
 	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 @@
 
 	/* Don't bother if no data. */
 	if (off == 0) {
-		xfree(buf);
+		free(buf);
 		return;
 	}
 	off--;	/* remove final \n */