Date: Sun, 9 Aug 2015 00:19:14 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r286493 - projects/collation/lib/libc/string Message-ID: <201508090019.t790JEkv035990@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Sun Aug 9 00:19:14 2015 New Revision: 286493 URL: https://svnweb.freebsd.org/changeset/base/286493 Log: Fix typo Remove useless tests before free() Suggested by: jilles Modified: projects/collation/lib/libc/string/strcoll.c projects/collation/lib/libc/string/strxfrm.c Modified: projects/collation/lib/libc/string/strcoll.c ============================================================================== --- projects/collation/lib/libc/string/strcoll.c Sun Aug 9 00:15:17 2015 (r286492) +++ projects/collation/lib/libc/string/strcoll.c Sun Aug 9 00:19:14 2015 (r286493) @@ -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, 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)); } Modified: projects/collation/lib/libc/string/strxfrm.c ============================================================================== --- projects/collation/lib/libc/string/strxfrm.c Sun Aug 9 00:15:17 2015 (r286492) +++ projects/collation/lib/libc/string/strxfrm.c Sun Aug 9 00:19:14 2015 (r286493) @@ -84,8 +84,7 @@ strxfrm_l(char * __restrict dest, const 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 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); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508090019.t790JEkv035990>