d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix typo

Browse Source 
Remove useless tests before free()

Suggested by:	jilles
This commit is contained in:
Baptiste Daroussin 2015-08-09 00:19:14 +00:00
parent 764a768e16
commit c71b548239
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/libc/string/strcoll.c
View File

@ -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));
}

8
lib/libc/string/strxfrm.c
View File

@ -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);
}