svn commit: r188888 - head/usr.bin/vmstat

Xin LI delphij at FreeBSD.org
Fri Feb 20 19:43:21 PST 2009


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)


More information about the svn-src-all mailing list