jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-11-27 13:32:45 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

free(3) won't mess with errno so return it as-is.

Browse Source 
Submitted by:	Jaakko Heinonen <jh saunalahti fi>
This commit is contained in:
Xin LI 2009-06-22 21:49:55 +00:00
parent 4ad1c464fe
commit c9f1e38a85
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=194663
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/libkiconv/kiconv_sysctl.c
View File

@ -39,7 +39,6 @@ int
kiconv_lookupconv(const char *drvname) kiconv_lookupconv(const char *drvname)
{ {
size_t size; size_t size;
int error;
if (sysctlbyname("kern.iconv.drvlist", NULL, &size, NULL, 0) == -1) if (sysctlbyname("kern.iconv.drvlist", NULL, &size, NULL, 0) == -1)
return (errno); return (errno);
@ -50,7 +49,6 @@ kiconv_lookupconv(const char *drvname)
if (drivers == NULL) if (drivers == NULL)
return (ENOMEM); return (ENOMEM);
if (sysctlbyname("kern.iconv.drvlist", drivers, &size, NULL, 0) == -1) { if (sysctlbyname("kern.iconv.drvlist", drivers, &size, NULL, 0) == -1) {
error = errno;
free(drivers); free(drivers);
return (errno); return (errno);
} }
@ -68,7 +66,6 @@ kiconv_lookupcs(const char *tocode, const char *fromcode)
{ {
size_t i, size; size_t i, size;
struct iconv_cspair_info *csi, *csip; struct iconv_cspair_info *csi, *csip;
int error;
if (sysctlbyname("kern.iconv.cslist", NULL, &size, NULL, 0) == -1) if (sysctlbyname("kern.iconv.cslist", NULL, &size, NULL, 0) == -1)
return (errno); return (errno);
@ -77,9 +74,8 @@ kiconv_lookupcs(const char *tocode, const char *fromcode)
if (csi == NULL) if (csi == NULL)
return (ENOMEM); return (ENOMEM);
if (sysctlbyname("kern.iconv.cslist", csi, &size, NULL, 0) == -1) { if (sysctlbyname("kern.iconv.cslist", csi, &size, NULL, 0) == -1) {
error = errno;
free(csi); free(csi);
return (error); return (errno);
} }
for (i = 0, csip = csi; i < (size/sizeof(*csi)); i++, csip++){ for (i = 0, csip = csi; i < (size/sizeof(*csi)); i++, csip++){
if (strcmp(csip->cs_to, tocode) == 0 && if (strcmp(csip->cs_to, tocode) == 0 &&