===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/vmstat/dkstats.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -c -r1.40 -r1.41
*** src/usr.bin/vmstat/dkstats.c	2017/05/30 05:57:46	1.40
--- src/usr.bin/vmstat/dkstats.c	2019/06/28 13:35:05	1.41
***************
*** 1,4 ****
! /*	$OpenBSD: dkstats.c,v 1.40 2017/05/30 05:57:46 tedu Exp $	*/
  /*	$NetBSD: dkstats.c,v 1.1 1996/05/10 23:19:27 thorpej Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: dkstats.c,v 1.41 2019/06/28 13:35:05 deraadt Exp $	*/
  /*	$NetBSD: dkstats.c,v 1.1 1996/05/10 23:19:27 thorpej Exp $	*/
  
  /*
***************
*** 176,182 ****
  		mib[0] = CTL_HW;
  		mib[1] = HW_DISKCOUNT;
  		size = sizeof(dk_ndrive);
! 		if (sysctl(mib, 2, &dk_ndrive, &size, NULL, 0) < 0 ) {
  			warn("could not read hw.diskcount");
  			dk_ndrive = 0;
  		}
--- 176,182 ----
  		mib[0] = CTL_HW;
  		mib[1] = HW_DISKCOUNT;
  		size = sizeof(dk_ndrive);
! 		if (sysctl(mib, 2, &dk_ndrive, &size, NULL, 0) == -1 ) {
  			warn("could not read hw.diskcount");
  			dk_ndrive = 0;
  		}
***************
*** 189,200 ****
  			mib[0] = CTL_HW;
  			mib[1] = HW_DISKNAMES;
  			size = 0;
! 			if (sysctl(mib, 2, NULL, &size, NULL, 0) < 0)
  				err(1, "can't get hw.disknames");
  			disknames = malloc(size);
  			if (disknames == NULL)
  				err(1, NULL);
! 			if (sysctl(mib, 2, disknames, &size, NULL, 0) < 0)
  				err(1, "can't get hw.disknames");
  			bufpp = disknames;
  			for (i = 0; i < dk_ndrive &&
--- 189,200 ----
  			mib[0] = CTL_HW;
  			mib[1] = HW_DISKNAMES;
  			size = 0;
! 			if (sysctl(mib, 2, NULL, &size, NULL, 0) == -1)
  				err(1, "can't get hw.disknames");
  			disknames = malloc(size);
  			if (disknames == NULL)
  				err(1, NULL);
! 			if (sysctl(mib, 2, disknames, &size, NULL, 0) == -1)
  				err(1, "can't get hw.disknames");
  			bufpp = disknames;
  			for (i = 0; i < dk_ndrive &&
***************
*** 357,363 ****
  		q = malloc(size);
  		if (q == NULL)
  			err(1, NULL);
! 		if (sysctl(mib, 2, q, &size, NULL, 0) < 0) {
  #ifdef	DEBUG
  			warn("could not read hw.diskstats");
  #endif	/* DEBUG */
--- 357,363 ----
  		q = malloc(size);
  		if (q == NULL)
  			err(1, NULL);
! 		if (sysctl(mib, 2, q, &size, NULL, 0) == -1) {
  #ifdef	DEBUG
  			warn("could not read hw.diskstats");
  #endif	/* DEBUG */
***************
*** 377,383 ****
  		size = sizeof(cur.cp_time);
  		mib[0] = CTL_KERN;
  		mib[1] = KERN_CPTIME;
! 		if (sysctl(mib, 2, cur.cp_time, &size, NULL, 0) < 0) {
  			warn("could not read kern.cp_time");
  			memset(cur.cp_time, 0, sizeof(cur.cp_time));
  		}
--- 377,383 ----
  		size = sizeof(cur.cp_time);
  		mib[0] = CTL_KERN;
  		mib[1] = KERN_CPTIME;
! 		if (sysctl(mib, 2, cur.cp_time, &size, NULL, 0) == -1) {
  			warn("could not read kern.cp_time");
  			memset(cur.cp_time, 0, sizeof(cur.cp_time));
  		}
***************
*** 385,391 ****
  		mib[0] = CTL_KERN;
  		mib[1] = KERN_TTY;
  		mib[2] = KERN_TTY_TKNIN;
! 		if (sysctl(mib, 3, &cur.tk_nin, &size, NULL, 0) < 0) {
  			warn("could not read kern.tty.tk_nin");
  			cur.tk_nin = 0;
  		}
--- 385,391 ----
  		mib[0] = CTL_KERN;
  		mib[1] = KERN_TTY;
  		mib[2] = KERN_TTY_TKNIN;
! 		if (sysctl(mib, 3, &cur.tk_nin, &size, NULL, 0) == -1) {
  			warn("could not read kern.tty.tk_nin");
  			cur.tk_nin = 0;
  		}
***************
*** 393,399 ****
  		mib[0] = CTL_KERN;
  		mib[1] = KERN_TTY;
  		mib[2] = KERN_TTY_TKNOUT;
! 		if (sysctl(mib, 3, &cur.tk_nout, &size, NULL, 0) < 0) {
  			warn("could not read kern.tty.tk_nout");
  			cur.tk_nout = 0;
  		}
--- 393,399 ----
  		mib[0] = CTL_KERN;
  		mib[1] = KERN_TTY;
  		mib[2] = KERN_TTY_TKNOUT;
! 		if (sysctl(mib, 3, &cur.tk_nout, &size, NULL, 0) == -1) {
  			warn("could not read kern.tty.tk_nout");
  			cur.tk_nout = 0;
  		}
***************
*** 472,478 ****
  		mib[0] = CTL_HW;
  		mib[1] = HW_DISKCOUNT;
  		size = sizeof(cur.dk_ndrive);
! 		if (sysctl(mib, 2, &cur.dk_ndrive, &size, NULL, 0) < 0 ) {
  			warn("could not read hw.diskcount");
  			cur.dk_ndrive = 0;
  		}
--- 472,478 ----
  		mib[0] = CTL_HW;
  		mib[1] = HW_DISKCOUNT;
  		size = sizeof(cur.dk_ndrive);
! 		if (sysctl(mib, 2, &cur.dk_ndrive, &size, NULL, 0) == -1 ) {
  			warn("could not read hw.diskcount");
  			cur.dk_ndrive = 0;
  		}
***************
*** 481,487 ****
  		mib[0] = CTL_KERN;
  		mib[1] = KERN_CLOCKRATE;
  		size = sizeof(clkinfo);
! 		if (sysctl(mib, 2, &clkinfo, &size, NULL, 0) < 0) {
  			warn("could not read kern.clockrate");
  			hz = 0;
  		} else
--- 481,487 ----
  		mib[0] = CTL_KERN;
  		mib[1] = KERN_CLOCKRATE;
  		size = sizeof(clkinfo);
! 		if (sysctl(mib, 2, &clkinfo, &size, NULL, 0) == -1) {
  			warn("could not read kern.clockrate");
  			hz = 0;
  		} else
***************
*** 521,532 ****
  		mib[0] = CTL_HW;
  		mib[1] = HW_DISKNAMES;
  		size = 0;
! 		if (sysctl(mib, 2, NULL, &size, NULL, 0) < 0)
  			err(1, "can't get hw.disknames");
  		disknames = malloc(size);
  		if (disknames == NULL)
  			err(1, NULL);
! 		if (sysctl(mib, 2, disknames, &size, NULL, 0) < 0)
  			err(1, "can't get hw.disknames");
  		bufpp = disknames;
  		for (i = 0; i < dk_ndrive && (name = strsep(&bufpp, ",")) != NULL; i++) {
--- 521,532 ----
  		mib[0] = CTL_HW;
  		mib[1] = HW_DISKNAMES;
  		size = 0;
! 		if (sysctl(mib, 2, NULL, &size, NULL, 0) == -1)
  			err(1, "can't get hw.disknames");
  		disknames = malloc(size);
  		if (disknames == NULL)
  			err(1, NULL);
! 		if (sysctl(mib, 2, disknames, &size, NULL, 0) == -1)
  			err(1, "can't get hw.disknames");
  		bufpp = disknames;
  		for (i = 0; i < dk_ndrive && (name = strsep(&bufpp, ",")) != NULL; i++) {