From owner-svn-src-head@FreeBSD.ORG  Mon Jun 22 21:49:56 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 39D73106566C;
	Mon, 22 Jun 2009 21:49:56 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 27AC98FC17;
	Mon, 22 Jun 2009 21:49:56 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5MLnuEP053826;
	Mon, 22 Jun 2009 21:49:56 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5MLnuoI053824;
	Mon, 22 Jun 2009 21:49:56 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <200906222149.n5MLnuoI053824@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Mon, 22 Jun 2009 21:49:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194663 - head/lib/libkiconv
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 22 Jun 2009 21:49:56 -0000

Author: delphij
Date: Mon Jun 22 21:49:55 2009
New Revision: 194663
URL: http://svn.freebsd.org/changeset/base/194663

Log:
  free(3) won't mess with errno so return it as-is.
  
  Submitted by:	Jaakko Heinonen <jh saunalahti fi>

Modified:
  head/lib/libkiconv/kiconv_sysctl.c

Modified: head/lib/libkiconv/kiconv_sysctl.c
==============================================================================
--- head/lib/libkiconv/kiconv_sysctl.c	Mon Jun 22 21:46:40 2009	(r194662)
+++ head/lib/libkiconv/kiconv_sysctl.c	Mon Jun 22 21:49:55 2009	(r194663)
@@ -39,7 +39,6 @@ int
 kiconv_lookupconv(const char *drvname)
 {
 	size_t size;
-	int error;
 
 	if (sysctlbyname("kern.iconv.drvlist", NULL, &size, NULL, 0) == -1)
 		return (errno);
@@ -50,7 +49,6 @@ kiconv_lookupconv(const char *drvname)
 		if (drivers == NULL)
 			return (ENOMEM);
 		if (sysctlbyname("kern.iconv.drvlist", drivers, &size, NULL, 0) == -1) {
-			error = errno;
 			free(drivers);
 			return (errno);
 		}
@@ -68,7 +66,6 @@ kiconv_lookupcs(const char *tocode, cons
 {
 	size_t i, size;
 	struct iconv_cspair_info *csi, *csip;
-	int error;
 
 	if (sysctlbyname("kern.iconv.cslist", NULL, &size, NULL, 0) == -1)
 		return (errno);
@@ -77,9 +74,8 @@ kiconv_lookupcs(const char *tocode, cons
 		if (csi == NULL)
 			return (ENOMEM);
 		if (sysctlbyname("kern.iconv.cslist", csi, &size, NULL, 0) == -1) {
-			error = errno;
 			free(csi);
-			return (error);
+			return (errno);
 		}
 		for (i = 0, csip = csi; i < (size/sizeof(*csi)); i++, csip++){
 			if (strcmp(csip->cs_to, tocode) == 0 &&