From owner-svn-src-head@FreeBSD.ORG  Sat Feb 21 03:43:20 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 E04511065676;
	Sat, 21 Feb 2009 03:43:20 +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 CE64F8FC23;
	Sat, 21 Feb 2009 03:43:20 +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 n1L3hKHx047457;
	Sat, 21 Feb 2009 03:43:20 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1L3hKcQ047456;
	Sat, 21 Feb 2009 03:43:20 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <200902210343.n1L3hKcQ047456@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Sat, 21 Feb 2009 03:43:20 +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: r188888 - head/usr.bin/vmstat
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: Sat, 21 Feb 2009 03:43:21 -0000

Author: delphij
Date: Sat Feb 21 03:43:20 2009
New Revision: 188888
URL: http://svn.freebsd.org/changeset/base/188888

Log:
  Utilize calloc() instead of bzero'ing manually.

Modified:
  head/usr.bin/vmstat/vmstat.c

Modified: head/usr.bin/vmstat/vmstat.c
==============================================================================
--- head/usr.bin/vmstat/vmstat.c	Sat Feb 21 03:42:31 2009	(r188887)
+++ head/usr.bin/vmstat/vmstat.c	Sat Feb 21 03:43:20 2009	(r188888)
@@ -346,10 +346,8 @@ getdrivedata(char **argv)
 	if ((num_devices = devstat_getnumdevs(NULL)) < 0)
 		errx(1, "%s", devstat_errbuf);
 
-	cur.dinfo = (struct devinfo *)malloc(sizeof(struct devinfo));
-	last.dinfo = (struct devinfo *)malloc(sizeof(struct devinfo));
-	bzero(cur.dinfo, sizeof(struct devinfo));
-	bzero(last.dinfo, sizeof(struct devinfo));
+	cur.dinfo = (struct devinfo *)calloc(1, sizeof(struct devinfo));
+	last.dinfo = (struct devinfo *)calloc(1, sizeof(struct devinfo));
 
 	if (devstat_getdevs(NULL, &cur) == -1)
 		errx(1, "%s", devstat_errbuf);
@@ -616,10 +614,8 @@ dovmstat(unsigned int interval, int reps
 	if (Pflag) {
 		ncpus = getcpuinfo(&cpumask, &maxid);
 		size_cp_times = sizeof(long) * (maxid + 1) * CPUSTATES;
-		cur_cp_times = malloc(size_cp_times);
-		last_cp_times = malloc(size_cp_times);
-		bzero(cur_cp_times, size_cp_times);
-		bzero(last_cp_times, size_cp_times);
+		cur_cp_times = calloc(1, size_cp_times);
+		last_cp_times = calloc(1, size_cp_times);
 	}
 	for (hdrcnt = 1;;) {
 		if (!--hdrcnt)