From owner-svn-src-all@FreeBSD.ORG  Sat Jul  3 22:02:29 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 824B4106566C;
	Sat,  3 Jul 2010 22:02:29 +0000 (UTC)
	(envelope-from marcel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 724FD8FC14;
	Sat,  3 Jul 2010 22:02:29 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o63M2T6r037841;
	Sat, 3 Jul 2010 22:02:29 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o63M2TZt037839;
	Sat, 3 Jul 2010 22:02:29 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201007032202.o63M2TZt037839@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Sat, 3 Jul 2010 22:02:29 +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: r209677 - head/sbin/mca
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 03 Jul 2010 22:02:29 -0000

Author: marcel
Date: Sat Jul  3 22:02:29 2010
New Revision: 209677
URL: http://svn.freebsd.org/changeset/base/209677

Log:
  sysctlbyname() returns -1 on error and sets errno. It does
  not return the error itself.

Modified:
  head/sbin/mca/mca.c

Modified: head/sbin/mca/mca.c
==============================================================================
--- head/sbin/mca/mca.c	Sat Jul  3 21:31:05 2010	(r209676)
+++ head/sbin/mca/mca.c	Sat Jul  3 22:02:29 2010	(r209677)
@@ -469,29 +469,28 @@ main(int argc, char **argv)
 
 	if (file == NULL || fl_dump) {
 		len = sizeof(count);
-		error = sysctlbyname(hw_mca_count, &count, &len, NULL, 0);
-		if (error)
+		if (sysctlbyname(hw_mca_count, &count, &len, NULL, 0) == -1)
 			err(1, hw_mca_count);
 
 		if (count == 0)
 			errx(0, "no error records found");
 
 		len = sizeof(first);
-		error = sysctlbyname(hw_mca_first, &first, &len, NULL, 0);
-		if (error)
+		if (sysctlbyname(hw_mca_first, &first, &len, NULL, 0) == -1)
 			err(1, hw_mca_first);
 
 		len = sizeof(last);
-		error = sysctlbyname(hw_mca_last, &last, &len, NULL, 0);
-		if (error)
+		if (sysctlbyname(hw_mca_last, &last, &len, NULL, 0) == -1)
 			err(1, hw_mca_last);
 
 		cpuid = 0;
+		error = 0;
 		while (count && first <= last) {
 			do {
 				sprintf(mib, hw_mca_recid, first, cpuid);
 				len = 0;
-				error = sysctlbyname(mib, NULL, &len, NULL, 0);
+				ch = sysctlbyname(mib, NULL, &len, NULL, 0);
+				error = (ch == -1) ? errno : 0;
 				if (error != ENOENT)
 					break;
 				cpuid++;
@@ -502,14 +501,13 @@ main(int argc, char **argv)
 				continue;
 			}
 			if (error)
-				err(1, "%s(1)", mib);
+				errc(1, error, "%s(1)", mib);
 
 			buf = malloc(len);
 			if (buf == NULL)
 				err(1, "buffer");
 
-			error = sysctlbyname(mib, buf, &len, NULL, 0);
-			if (error)
+			if (sysctlbyname(mib, buf, &len, NULL, 0) == -1)
 				err(1, "%s(2)", mib);
 
 			if (fl_dump)