From d68017be3aa40615c000f0b0ac8ae1286b11dca8 Mon Sep 17 00:00:00 2001
From: bapt <bapt@FreeBSD.org>
Date: Sun, 9 Aug 2015 00:19:14 +0000
Subject: Fix typo Remove useless tests before free()

Suggested by:	jilles
---
 lib/libc/string/strcoll.c | 14 +++++---------
 lib/libc/string/strxfrm.c |  8 +++-----
 2 files changed, 8 insertions(+), 14 deletions(-)

(limited to 'lib/libc/string')

diff --git a/lib/libc/string/strcoll.c b/lib/libc/string/strcoll.c
index 5bad40c..7675e0a 100644
--- a/lib/libc/string/strcoll.c
+++ b/lib/libc/string/strcoll.c
@@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$");
 
 
 /*
- * In order to properly handle multibyte locales, its easiet to just
+ * In order to properly handle multibyte locales, its easiest to just
  * convert to wide characters and then use wcscoll.  However if an
  * error occurs, we gracefully fall back to simple strcmp.  Caller
  * should check errno.
@@ -99,18 +99,14 @@ strcoll_l(const char *s, const char *s2, locale_t locale)
 		goto error;
 
 	ret = wcscoll_l(w1, w2, locale);
-	if (t1)
-		free(t1);
-	if (t2)
-		free(t2);
+	free(t1);
+	free(t2);
 
 	return (ret);
 
 error:
-	if (t1)
-		free(t1);
-	if (t2)
-		free(t2);
+	free(t1);
+	free(t2);
 	return (strcmp(s, s2));
 }
 
diff --git a/lib/libc/string/strxfrm.c b/lib/libc/string/strxfrm.c
index 8b25b0e..06ae639 100644
--- a/lib/libc/string/strxfrm.c
+++ b/lib/libc/string/strxfrm.c
@@ -84,8 +84,7 @@ strxfrm_l(char * __restrict dest, const char * __restrict src, size_t len, local
 	if ((xlen = _collate_sxfrm(table, wcs, dest, len)) == (size_t)-1)
 		goto error;
 
-	if (wcs)
-		free(wcs);
+	free(wcs);
 
 	if (len > xlen) {
 		dest[xlen] = 0;
@@ -97,9 +96,8 @@ strxfrm_l(char * __restrict dest, const char * __restrict src, size_t len, local
 
 error:
 	/* errno should be set to ENOMEM if malloc failed */
-	if (wcs)
-		free(wcs);
-	(void) strlcpy(dest, src, len);
+	free(wcs);
+	strlcpy(dest, src, len);
 
 	return (slen);
 }
-- 
cgit v1.1