===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/top/machine.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -c -r1.96 -r1.97
*** src/usr.bin/top/machine.c	2018/11/28 22:00:30	1.96
--- src/usr.bin/top/machine.c	2019/06/28 13:35:05	1.97
***************
*** 1,4 ****
! /* $OpenBSD: machine.c,v 1.96 2018/11/28 22:00:30 kn Exp $	 */
  
  /*-
   * Copyright (c) 1994 Thorsten Lockert <tholo@sigmasoft.com>
--- 1,4 ----
! /* $OpenBSD: machine.c,v 1.97 2019/06/28 13:35:05 deraadt Exp $	 */
  
  /*-
   * Copyright (c) 1994 Thorsten Lockert <tholo@sigmasoft.com>
***************
*** 154,160 ****
  	size_t size = sizeof(fscale);
  
  	if (sysctl(mib, sizeof(mib) / sizeof(mib[0]),
! 	    &fscale, &size, NULL, 0) < 0)
  		return (-1);
  	return fscale;
  }
--- 154,160 ----
  	size_t size = sizeof(fscale);
  
  	if (sysctl(mib, sizeof(mib) / sizeof(mib[0]),
! 	    &fscale, &size, NULL, 0) == -1)
  		return (-1);
  	return fscale;
  }
***************
*** 272,278 ****
  	for (i = 0; i < ncpu; i++) {
  		cpustats_mib[2] = i;
  		tmpstate = cpu_states + (CPUSTATES * i);
! 		if (sysctl(cpustats_mib, 3, &cp_time[i], &size, NULL, 0) < 0)
  			warn("sysctl kern.cpustats failed");
  		/* convert cpustats counts to percentages */
  		(void) percentages(CPUSTATES, tmpstate, cp_time[i].cs_time,
--- 272,278 ----
  	for (i = 0; i < ncpu; i++) {
  		cpustats_mib[2] = i;
  		tmpstate = cpu_states + (CPUSTATES * i);
! 		if (sysctl(cpustats_mib, 3, &cp_time[i], &size, NULL, 0) == -1)
  			warn("sysctl kern.cpustats failed");
  		/* convert cpustats counts to percentages */
  		(void) percentages(CPUSTATES, tmpstate, cp_time[i].cs_time,
***************
*** 282,288 ****
  	}
  
  	size = sizeof(sysload);
! 	if (sysctl(sysload_mib, 2, &sysload, &size, NULL, 0) < 0)
  		warn("sysctl failed");
  	infoloadp = si->load_avg;
  	for (i = 0; i < 3; i++)
--- 282,288 ----
  	}
  
  	size = sizeof(sysload);
! 	if (sysctl(sysload_mib, 2, &sysload, &size, NULL, 0) == -1)
  		warn("sysctl failed");
  	infoloadp = si->load_avg;
  	for (i = 0; i < 3; i++)
***************
*** 291,302 ****
  
  	/* get total -- systemwide main memory usage structure */
  	size = sizeof(uvmexp);
! 	if (sysctl(uvmexp_mib, 2, &uvmexp, &size, NULL, 0) < 0) {
  		warn("sysctl failed");
  		bzero(&uvmexp, sizeof(uvmexp));
  	}
  	size = sizeof(bcstats);
! 	if (sysctl(bcstats_mib, 3, &bcstats, &size, NULL, 0) < 0) {
  		warn("sysctl failed");
  		bzero(&bcstats, sizeof(bcstats));
  	}
--- 291,302 ----
  
  	/* get total -- systemwide main memory usage structure */
  	size = sizeof(uvmexp);
! 	if (sysctl(uvmexp_mib, 2, &uvmexp, &size, NULL, 0) == -1) {
  		warn("sysctl failed");
  		bzero(&uvmexp, sizeof(uvmexp));
  	}
  	size = sizeof(bcstats);
! 	if (sysctl(bcstats_mib, 3, &bcstats, &size, NULL, 0) == -1) {
  		warn("sysctl failed");
  		bzero(&bcstats, sizeof(bcstats));
  	}
***************
*** 337,343 ****
  	mib[3] = arg;
  
  	size = sizeof(maxslp);
! 	if (sysctl(maxslp_mib, 2, &maxslp, &size, NULL, 0) < 0) {
  		warn("sysctl vm.maxslp failed");
  		return (0);
  	}
--- 337,343 ----
  	mib[3] = arg;
  
  	size = sizeof(maxslp);
! 	if (sysctl(maxslp_mib, 2, &maxslp, &size, NULL, 0) == -1) {
  		warn("sysctl vm.maxslp failed");
  		return (0);
  	}