===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/window.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- src/usr.bin/tmux/window.c	2012/07/08 07:27:32	1.81
+++ src/usr.bin/tmux/window.c	2012/07/10 11:53:01	1.82
@@ -1,4 +1,4 @@
-/* $OpenBSD: window.c,v 1.81 2012/07/08 07:27:32 nicm Exp $ */
+/* $OpenBSD: window.c,v 1.82 2012/07/10 11:53:01 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -179,9 +179,8 @@
 	struct window	*w = wl->window;
 
 	RB_REMOVE(winlinks, wwl, wl);
-	if (wl->status_text != NULL)
-		xfree(wl->status_text);
-	xfree(wl);
+	free(wl->status_text);
+	free(wl);
 
 	if (w != NULL) {
 		if (w->references == 0)
@@ -359,16 +358,14 @@
 
 	window_destroy_panes(w);
 
-	if (w->name != NULL)
-		xfree(w->name);
-	xfree(w);
+	free(w->name);
+	free(w);
 }
 
 void
 window_set_name(struct window *w, const char *new_name)
 {
-	if (w->name != NULL)
-		xfree(w->name);
+	free(w->name);
 	w->name = xstrdup(new_name);
 	notify_window_renamed(w);
 }
@@ -671,13 +668,10 @@
 
 	RB_REMOVE(window_pane_tree, &all_window_panes, wp);
 
-	if (wp->cwd != NULL)
-		xfree(wp->cwd);
-	if (wp->shell != NULL)
-		xfree(wp->shell);
-	if (wp->cmd != NULL)
-		xfree(wp->cmd);
-	xfree(wp);
+	free(wp->cwd);
+	free(wp->shell);
+	free(wp->cmd);
+	free(wp);
 }
 
 int
@@ -694,18 +688,15 @@
 		close(wp->fd);
 	}
 	if (cmd != NULL) {
-		if (wp->cmd != NULL)
-			xfree(wp->cmd);
+		free(wp->cmd);
 		wp->cmd = xstrdup(cmd);
 	}
 	if (shell != NULL) {
-		if (wp->shell != NULL)
-			xfree(wp->shell);
+		free(wp->shell);
 		wp->shell = xstrdup(shell);
 	}
 	if (cwd != NULL) {
-		if (wp->cwd != NULL)
-			xfree(wp->cwd);
+		free(wp->cwd);
 		wp->cwd = xstrdup(cwd);
 	}
 
@@ -1048,10 +1039,10 @@
 				*lineno = i;
 			break;
 		}
-		xfree(line);
+		free(line);
 	}
 
-	xfree(newsearchstr);
+	free(newsearchstr);
 	return (msg);
 }