===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/Attic/cmd-string.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- src/usr.bin/tmux/Attic/cmd-string.c	2010/12/13 22:53:14	1.15
+++ src/usr.bin/tmux/Attic/cmd-string.c	2012/07/10 11:53:01	1.16
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-string.c,v 1.15 2010/12/13 22:53:14 nicm Exp $ */
+/* $OpenBSD: cmd-string.c,v 1.16 2012/07/10 11:53:01 nicm Exp $ */
 
 /*
  * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -87,7 +87,7 @@
 			buf = xrealloc(buf, 1, len + strlen(t) + 1);
 			strlcpy(buf + len, t, strlen(t) + 1);
 			len += strlen(t);
-			xfree(t);
+			free(t);
 			break;
 		case '"':
 			if ((t = cmd_string_string(s, &p, '"', 1)) == NULL)
@@ -95,7 +95,7 @@
 			buf = xrealloc(buf, 1, len + strlen(t) + 1);
 			strlcpy(buf + len, t, strlen(t) + 1);
 			len += strlen(t);
-			xfree(t);
+			free(t);
 			break;
 		case '$':
 			if ((t = cmd_string_variable(s, &p)) == NULL)
@@ -103,7 +103,7 @@
 			buf = xrealloc(buf, 1, len + strlen(t) + 1);
 			strlcpy(buf + len, t, strlen(t) + 1);
 			len += strlen(t);
-			xfree(t);
+			free(t);
 			break;
 		case '#':
 			/* Comment: discard rest of line. */
@@ -152,7 +152,7 @@
 				buf = xrealloc(buf, 1, len + strlen(t) + 1);
 				strlcpy(buf + len, t, strlen(t) + 1);
 				len += strlen(t);
-				xfree(t);
+				free(t);
 				break;
 			}
 			/* FALLTHROUGH */
@@ -170,13 +170,12 @@
 	xasprintf(cause, "invalid or unknown command: %s", s);
 
 out:
-	if (buf != NULL)
-		xfree(buf);
+	free(buf);
 
 	if (argv != NULL) {
 		for (i = 0; i < argc; i++)
-			xfree(argv[i]);
-		xfree(argv);
+			free(argv[i]);
+		free(argv);
 	}
 
 	return (rval);
@@ -224,7 +223,7 @@
 			buf = xrealloc(buf, 1, len + strlen(t) + 1);
 			strlcpy(buf + len, t, strlen(t) + 1);
 			len += strlen(t);
-			xfree(t);
+			free(t);
 			continue;
 		}
 
@@ -239,8 +238,7 @@
 	return (buf);
 
 error:
-	if (buf != NULL)
-		xfree(buf);
+	free(buf);
 	return (NULL);
 }
 
@@ -303,14 +301,13 @@
 	buf[len] = '\0';
 
 	envent = environ_find(&global_environ, buf);
-	xfree(buf);
+	free(buf);
 	if (envent == NULL)
 		return (xstrdup(""));
 	return (xstrdup(envent->value));
 
 error:
-	if (buf != NULL)
-		xfree(buf);
+	free(buf);
 	return (NULL);
 }
 
@@ -334,7 +331,7 @@
 			return (NULL);
 		if ((pw = getpwnam(username)) != NULL)
 			home = pw->pw_dir;
-		xfree(username);
+		free(username);
 	}
 	if (home == NULL)
 		return (NULL);