From owner-svn-src-all@FreeBSD.ORG  Wed Jan 25 20:13:38 2012
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 616C6106566C;
	Wed, 25 Jan 2012 20:13:38 +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 5041E8FC0A;
	Wed, 25 Jan 2012 20:13:38 +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 q0PKDcpB043574;
	Wed, 25 Jan 2012 20:13:38 GMT (envelope-from trociny@svn.freebsd.org)
Received: (from trociny@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0PKDcOP043572;
	Wed, 25 Jan 2012 20:13:38 GMT (envelope-from trociny@svn.freebsd.org)
Message-Id: <201201252013.q0PKDcOP043572@svn.freebsd.org>
From: Mikolaj Golub <trociny@FreeBSD.org>
Date: Wed, 25 Jan 2012 20:13:38 +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: r230548 - head/usr.bin/procstat
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: Wed, 25 Jan 2012 20:13:38 -0000

Author: trociny
Date: Wed Jan 25 20:13:37 2012
New Revision: 230548
URL: http://svn.freebsd.org/changeset/base/230548

Log:
  After the recent changes there is no need in rlimit array any more.
  
  Submitted by:	Andrey Zonov <andrey at zonov.org>
  MFC after:	1 week

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

Modified: head/usr.bin/procstat/procstat_rlimit.c
==============================================================================
--- head/usr.bin/procstat/procstat_rlimit.c	Wed Jan 25 20:05:58 2012	(r230547)
+++ head/usr.bin/procstat/procstat_rlimit.c	Wed Jan 25 20:13:37 2012	(r230548)
@@ -66,8 +66,6 @@ static struct {
 #error "Resource limits have grown. Add new entries to rlimit_param[]."
 #endif
 
-static struct rlimit rlimit[RLIM_NLIMITS];
-
 static
 const char *humanize_rlimit(int indx, rlim_t limit)
 {
@@ -90,6 +88,7 @@ const char *humanize_rlimit(int indx, rl
 void
 procstat_rlimit(struct kinfo_proc *kipp)
 {
+	struct rlimit rlimit;
 	int error, i, name[5];
 	size_t len;
 
@@ -104,7 +103,7 @@ procstat_rlimit(struct kinfo_proc *kipp)
 	name[3] = kipp->ki_pid;
 	for (i = 0; i < RLIM_NLIMITS; i++) {
 		name[4] = i;
-		error = sysctl(name, 5, &rlimit[i], &len, NULL, 0);
+		error = sysctl(name, 5, &rlimit, &len, NULL, 0);
 		if (error < 0 && errno != ESRCH) {
 			warn("sysctl: kern.proc.rlimit: %d", kipp->ki_pid);
 			return;
@@ -114,7 +113,7 @@ procstat_rlimit(struct kinfo_proc *kipp)
 
 		printf("%5d %-16s %-16s ", kipp->ki_pid, kipp->ki_comm,
 		    rlimit_param[i].name);
-		printf("%16s ", humanize_rlimit(i, rlimit[i].rlim_cur));
-		printf("%16s\n", humanize_rlimit(i, rlimit[i].rlim_max));
-        }
+		printf("%16s ", humanize_rlimit(i, rlimit.rlim_cur));
+		printf("%16s\n", humanize_rlimit(i, rlimit.rlim_max));
+	}
 }