===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/systat/vmstat.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -c -r1.90 -r1.91
*** src/usr.bin/systat/vmstat.c	2019/01/20 03:53:03	1.90
--- src/usr.bin/systat/vmstat.c	2019/06/28 13:35:04	1.91
***************
*** 1,4 ****
! /*	$OpenBSD: vmstat.c,v 1.90 2019/01/20 03:53:03 tedu Exp $	*/
  /*	$NetBSD: vmstat.c,v 1.5 1996/05/10 23:16:40 thorpej Exp $	*/
  
  /*-
--- 1,4 ----
! /*	$OpenBSD: vmstat.c,v 1.91 2019/06/28 13:35:04 deraadt Exp $	*/
  /*	$NetBSD: vmstat.c,v 1.5 1996/05/10 23:16:40 thorpej Exp $	*/
  
  /*-
***************
*** 176,189 ****
  	mib[0] = CTL_HW;
  	mib[1] = HW_NCPU;
  	size = sizeof(ncpu);
! 	if (sysctl(mib, 2, &ncpu, &size, NULL, 0) < 0)
  		return (-1);
  
  	mib[0] = CTL_KERN;
  	mib[1] = KERN_INTRCNT;
  	mib[2] = KERN_INTRCNT_NUM;
  	size = sizeof(nintr);
! 	if (sysctl(mib, 3, &nintr, &size, NULL, 0) < 0)
  		return (-1);
  
  	intrloc = calloc(nintr, sizeof(long));
--- 176,189 ----
  	mib[0] = CTL_HW;
  	mib[1] = HW_NCPU;
  	size = sizeof(ncpu);
! 	if (sysctl(mib, 2, &ncpu, &size, NULL, 0) == -1)
  		return (-1);
  
  	mib[0] = CTL_KERN;
  	mib[1] = KERN_INTRCNT;
  	mib[2] = KERN_INTRCNT_NUM;
  	size = sizeof(nintr);
! 	if (sysctl(mib, 3, &nintr, &size, NULL, 0) == -1)
  		return (-1);
  
  	intrloc = calloc(nintr, sizeof(long));
***************
*** 199,205 ****
  		mib[2] = KERN_INTRCNT_NAME;
  		mib[3] = i;
  		size = sizeof(name);
! 		if (sysctl(mib, 4, name, &size, NULL, 0) < 0)
  			return (-1);
  
  		intrname[i] = strdup(name);
--- 199,205 ----
  		mib[2] = KERN_INTRCNT_NAME;
  		mib[3] = i;
  		size = sizeof(name);
! 		if (sysctl(mib, 4, name, &size, NULL, 0) == -1)
  			return (-1);
  
  		intrname[i] = strdup(name);
***************
*** 616,622 ****
  		mib[2] = KERN_INTRCNT_CNT;
  		mib[3] = i;
  		size = sizeof(si->intrcnt[i]);
! 		if (sysctl(mib, 4, &si->intrcnt[i], &size, NULL, 0) < 0) {
  			si->intrcnt[i] = 0;
  		}
  	}
--- 616,622 ----
  		mib[2] = KERN_INTRCNT_CNT;
  		mib[3] = i;
  		size = sizeof(si->intrcnt[i]);
! 		if (sysctl(mib, 4, &si->intrcnt[i], &size, NULL, 0) == -1) {
  			si->intrcnt[i] = 0;
  		}
  	}
***************
*** 625,631 ****
  	for (i = 0; i < ncpu; i++) {
  		cpustats_mib[2] = i;
  		size = sizeof(cs);
! 		if (sysctl(cpustats_mib, 3, &cs, &size, NULL, 0) < 0) {
  			error("Can't get KERN_CPUSTATS: %s\n", strerror(errno));
  			memset(&si->cpustats, 0, sizeof(si->cpustats));
  		}
--- 625,631 ----
  	for (i = 0; i < ncpu; i++) {
  		cpustats_mib[2] = i;
  		size = sizeof(cs);
! 		if (sysctl(cpustats_mib, 3, &cs, &size, NULL, 0) == -1) {
  			error("Can't get KERN_CPUSTATS: %s\n", strerror(errno));
  			memset(&si->cpustats, 0, sizeof(si->cpustats));
  		}
***************
*** 636,654 ****
  	}
  
  	size = sizeof(si->nchstats);
! 	if (sysctl(nchstats_mib, 2, &si->nchstats, &size, NULL, 0) < 0) {
  		error("Can't get KERN_NCHSTATS: %s\n", strerror(errno));
  		memset(&si->nchstats, 0, sizeof(si->nchstats));
  	}
  
  	size = sizeof(si->uvmexp);
! 	if (sysctl(uvmexp_mib, 2, &si->uvmexp, &size, NULL, 0) < 0) {
  		error("Can't get VM_UVMEXP: %s\n", strerror(errno));
  		memset(&si->uvmexp, 0, sizeof(si->uvmexp));
  	}
  
  	size = sizeof(si->Total);
! 	if (sysctl(vmtotal_mib, 2, &si->Total, &size, NULL, 0) < 0) {
  		error("Can't get VM_METER: %s\n", strerror(errno));
  		memset(&si->Total, 0, sizeof(si->Total));
  	}
--- 636,654 ----
  	}
  
  	size = sizeof(si->nchstats);
! 	if (sysctl(nchstats_mib, 2, &si->nchstats, &size, NULL, 0) == -1) {
  		error("Can't get KERN_NCHSTATS: %s\n", strerror(errno));
  		memset(&si->nchstats, 0, sizeof(si->nchstats));
  	}
  
  	size = sizeof(si->uvmexp);
! 	if (sysctl(uvmexp_mib, 2, &si->uvmexp, &size, NULL, 0) == -1) {
  		error("Can't get VM_UVMEXP: %s\n", strerror(errno));
  		memset(&si->uvmexp, 0, sizeof(si->uvmexp));
  	}
  
  	size = sizeof(si->Total);
! 	if (sysctl(vmtotal_mib, 2, &si->Total, &size, NULL, 0) == -1) {
  		error("Can't get VM_METER: %s\n", strerror(errno));
  		memset(&si->Total, 0, sizeof(si->Total));
  	}