Replace bzero with memset. No binary change.

ok tb@

2 files changed, 14 insertions, 14 deletions

diff --git a/usr.bin/vmstat/dkstats.c b/usr.bin/vmstat/dkstats.c
index 880caf627c0..a7795fca9aa 100644
--- a/usr.bin/vmstat/dkstats.c
+++ b/usr.bin/vmstat/dkstats.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dkstats.c,v 1.37 2015/01/16 06:40:14 deraadt Exp $	*/
+/*	$OpenBSD: dkstats.c,v 1.38 2015/12/24 03:25:08 mmcc Exp $	*/
 /*	$NetBSD: dkstats.c,v 1.1 1996/05/10 23:19:27 thorpej Exp $	*/
 
 /*
@@ -221,7 +221,7 @@ dkreadstats(void)
 						last.dk_seek[i] = 0;
 						last.dk_rbytes[i] = 0;
 						last.dk_wbytes[i] = 0;
-						bzero(&last.dk_time[i],
+						memset(&last.dk_time[i], 0,
 						    sizeof(struct timeval));
 						continue;
 					}
@@ -319,7 +319,7 @@ dkreadstats(void)
 						last.dk_seek[i] = 0;
 						last.dk_rbytes[i] = 0;
 						last.dk_wbytes[i] = 0;
-						bzero(&last.dk_time[i],
+						memset(&last.dk_time[i], 0,
 						    sizeof(struct timeval));
 						continue;
 					}
@@ -361,7 +361,7 @@ dkreadstats(void)
 #ifdef	DEBUG
 			warn("could not read hw.diskstats");
 #endif	/* DEBUG */
-			bzero(q, cur.dk_ndrive * sizeof(struct diskstats));
+			memset(q, 0, cur.dk_ndrive * sizeof(struct diskstats));
 		}
 
 		for (i = 0; i < cur.dk_ndrive; i++)	{
@@ -379,7 +379,7 @@ dkreadstats(void)
 		mib[1] = KERN_CPTIME;
 		if (sysctl(mib, 2, cur.cp_time, &size, NULL, 0) < 0) {
 			warn("could not read kern.cp_time");
-			bzero(cur.cp_time, sizeof(cur.cp_time));
+			memset(cur.cp_time, 0, sizeof(cur.cp_time));
 		}
 		size = sizeof(cur.tk_nin);
 		mib[0] = CTL_KERN;
@@ -573,7 +573,7 @@ deref_kptr(void *kptr, void *ptr, size_t len)
 	char buf[128];
 
 	if (kvm_read(kd, (u_long)kptr, ptr, len) != len) {
-		bzero(buf, sizeof(buf));
+		memset(buf, 0, sizeof(buf));
 		snprintf(buf, (sizeof(buf) - 1),
 		     "can't dereference kptr 0x%lx", (u_long)kptr);
 		KVM_ERROR(buf);
diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c
index 3ed634ed663..536610bfdc4 100644
--- a/usr.bin/vmstat/vmstat.c
+++ b/usr.bin/vmstat/vmstat.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: vmstat.c,v 1.29.4.1 1996/06/05 00:21:05 cgd Exp $	*/
-/*	$OpenBSD: vmstat.c,v 1.138 2015/04/18 18:28:38 deraadt Exp $	*/
+/*	$OpenBSD: vmstat.c,v 1.139 2015/12/24 03:25:08 mmcc Exp $	*/
 
 /*
  * Copyright (c) 1980, 1986, 1991, 1993
@@ -346,7 +346,7 @@ dovmstat(u_int interval, int reps)
 			mib[1] = VM_UVMEXP;
 			if (sysctl(mib, 2, &uvmexp, &size, NULL, 0) < 0) {
 				warn("could not get vm.uvmexp");
-				bzero(&uvmexp, sizeof(struct uvmexp));
+				memset(&uvmexp, 0, sizeof(struct uvmexp));
 			}
 		} else {
 			kread(X_UVMEXP, &uvmexp, sizeof(struct uvmexp));
@@ -356,7 +356,7 @@ dovmstat(u_int interval, int reps)
 		mib[1] = VM_METER;
 		if (sysctl(mib, 2, &total, &size, NULL, 0) < 0) {
 			warn("could not read vm.vmmeter");
-			bzero(&total, sizeof(total));
+			memset(&total, 0, sizeof(total));
 		}
 		(void)printf(" %u %u %u ",
 		    total.t_rq - 1, total.t_dw + total.t_pw, total.t_sw);
@@ -449,7 +449,7 @@ dotimes(void)
 		mib[1] = VM_UVMEXP;
 		if (sysctl(mib, 2, &uvmexp, &size, NULL, 0) < 0) {
 			warn("could not read vm.uvmexp");
-			bzero(&uvmexp, sizeof(struct uvmexp));
+			memset(&uvmexp, 0, sizeof(struct uvmexp));
 		}
 	} else {
 		kread(X_UVMEXP, &uvmexp, sizeof(struct uvmexp));
@@ -493,7 +493,7 @@ dosum(void)
 		mib[1] = VM_UVMEXP;
 		if (sysctl(mib, 2, &uvmexp, &size, NULL, 0) < 0) {
 			warn("could not read vm.uvmexp");
-			bzero(&uvmexp, sizeof(struct uvmexp));
+			memset(&uvmexp, 0, sizeof(struct uvmexp));
 		}
 	} else {
 		kread(X_UVMEXP, &uvmexp, sizeof(struct uvmexp));
@@ -552,7 +552,7 @@ dosum(void)
 		mib[1] = KERN_NCHSTATS;
 		if (sysctl(mib, 2, &nchstats, &size, NULL, 0) < 0) {
 			warn("could not read kern.nchstats");
-			bzero(&nchstats, sizeof(nchstats));
+			memset(&nchstats, 0, sizeof(nchstats));
 		}
 	} else {
 		kread(X_NCHSTATS, &nchstats, sizeof(nchstats));
@@ -599,7 +599,7 @@ doforkst(void)
 		mib[1] = KERN_FORKSTAT;
 		if (sysctl(mib, 2, &fks, &size, NULL, 0) < 0) {
 			warn("could not read kern.forkstat");
-			bzero(&fks, sizeof(struct forkstat));
+			memset(&fks, 0, sizeof(struct forkstat));
 		}
 	} else {
 		kread(X_FORKSTAT, &fks, sizeof(struct forkstat));
@@ -816,7 +816,7 @@ domem(void)
 	}
 
 	if (memf == NULL && nlistf == NULL) {
-		bzero(kmemstats, sizeof(kmemstats));
+		memset(kmemstats, 0, sizeof(kmemstats));
 		for (i = 0; i < M_LAST; i++) {
 			mib[0] = CTL_KERN;
 			mib[1] = KERN_MALLOCSTATS;