From owner-svn-src-head@FreeBSD.ORG  Sun Jan 29 20:39:43 2012
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 5771B1065675;
	Sun, 29 Jan 2012 20:39:43 +0000 (UTC)
	(envelope-from trociny@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 41CBA8FC0A;
	Sun, 29 Jan 2012 20:39:43 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q0TKdhOm051695;
	Sun, 29 Jan 2012 20:39:43 GMT (envelope-from trociny@svn.freebsd.org)
Received: (from trociny@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0TKdhA7051693;
	Sun, 29 Jan 2012 20:39:43 GMT (envelope-from trociny@svn.freebsd.org)
Message-Id: <201201292039.q0TKdhA7051693@svn.freebsd.org>
From: Mikolaj Golub <trociny@FreeBSD.org>
Date: Sun, 29 Jan 2012 20:39:43 +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: r230753 - head/usr.bin/procstat
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: Sun, 29 Jan 2012 20:39:43 -0000

Author: trociny
Date: Sun Jan 29 20:39:42 2012
New Revision: 230753
URL: http://svn.freebsd.org/changeset/base/230753

Log:
  Always return 0 if the sysctl failed.
  
  This fixes the bug: when procstat -xa was run and the sysctl for a
  process returned ESRCH or EPERM, for this process procstat output the
  result collected for the previous successful process.

Modified:
  head/usr.bin/procstat/procstat_auxv.c

Modified: head/usr.bin/procstat/procstat_auxv.c
==============================================================================
--- head/usr.bin/procstat/procstat_auxv.c	Sun Jan 29 19:35:40 2012	(r230752)
+++ head/usr.bin/procstat/procstat_auxv.c	Sun Jan 29 20:39:42 2012	(r230753)
@@ -81,7 +81,7 @@ is_elf32(pid_t pid)
 static size_t
 retrieve_auxv32(pid_t pid)
 {
-	int error, name[4];
+	int name[4];
 	size_t len, i;
 	void *ptr;
 
@@ -90,9 +90,9 @@ retrieve_auxv32(pid_t pid)
 	name[2] = KERN_PROC_AUXV;
 	name[3] = pid;
 	len = sizeof(auxv32);
-	error = sysctl(name, 4, auxv32, &len, NULL, 0);
-	if (error < 0 && errno != ESRCH && errno != EPERM) {
-		warn("sysctl: kern.proc.auxv: %d: %d", pid, errno);
+	if (sysctl(name, 4, auxv32, &len, NULL, 0) == -1) {
+		if (errno != ESRCH && errno != EPERM)
+			warn("sysctl: kern.proc.auxv: %d: %d", pid, errno);
 		return (0);
 	}
 	for (i = 0; i < len; i++) {
@@ -117,7 +117,7 @@ retrieve_auxv32(pid_t pid)
 static size_t
 retrieve_auxv(pid_t pid)
 {
-	int error, name[4];
+	int name[4];
 	size_t len;
 
 #if __ELF_WORD_SIZE == 64
@@ -129,9 +129,9 @@ retrieve_auxv(pid_t pid)
 	name[2] = KERN_PROC_AUXV;
 	name[3] = pid;
 	len = sizeof(auxv);
-	error = sysctl(name, 4, auxv, &len, NULL, 0);
-	if (error < 0 && errno != ESRCH && errno != EPERM) {
-		warn("sysctl: kern.proc.auxv: %d: %d", pid, errno);
+	if (sysctl(name, 4, auxv, &len, NULL, 0) == -1) {
+		if (errno != ESRCH && errno != EPERM)
+			warn("sysctl: kern.proc.auxv: %d: %d", pid, errno);
 		return (0);
 	}
 	return (len);