===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/top/machine.c,v
retrieving revision 1.97
retrieving revision 1.98
diff -c -r1.97 -r1.98
*** src/usr.bin/top/machine.c	2019/06/28 13:35:05	1.97
--- src/usr.bin/top/machine.c	2019/10/06 15:05:35	1.98
***************
*** 1,4 ****
! /* $OpenBSD: machine.c,v 1.97 2019/06/28 13:35:05 deraadt Exp $	 */
  
  /*-
   * Copyright (c) 1994 Thorsten Lockert <tholo@sigmasoft.com>
--- 1,4 ----
! /* $OpenBSD: machine.c,v 1.98 2019/10/06 15:05:35 kn Exp $	 */
  
  /*-
   * Copyright (c) 1994 Thorsten Lockert <tholo@sigmasoft.com>
***************
*** 636,646 ****
  /* remove one level of indirection and set sort order */
  #define SETORDER do { \
  		if (rev_order) { \
! 			p1 = *(struct kinfo_proc **) pp2; \
! 			p2 = *(struct kinfo_proc **) pp1; \
  		} else { \
! 			p1 = *(struct kinfo_proc **) pp1; \
! 			p2 = *(struct kinfo_proc **) pp2; \
  		} \
  	} while (0)
  
--- 636,646 ----
  /* remove one level of indirection and set sort order */
  #define SETORDER do { \
  		if (rev_order) { \
! 			p1 = *(struct kinfo_proc **) v2; \
! 			p2 = *(struct kinfo_proc **) v1; \
  		} else { \
! 			p1 = *(struct kinfo_proc **) v1; \
! 			p2 = *(struct kinfo_proc **) v2; \
  		} \
  	} while (0)
  
***************
*** 648,655 ****
  static int
  compare_cpu(const void *v1, const void *v2)
  {
- 	struct proc **pp1 = (struct proc **) v1;
- 	struct proc **pp2 = (struct proc **) v2;
  	struct kinfo_proc *p1, *p2;
  	int result;
  
--- 648,653 ----
***************
*** 669,676 ****
  static int
  compare_size(const void *v1, const void *v2)
  {
- 	struct proc **pp1 = (struct proc **) v1;
- 	struct proc **pp2 = (struct proc **) v2;
  	struct kinfo_proc *p1, *p2;
  	int result;
  
--- 667,672 ----
***************
*** 690,697 ****
  static int
  compare_res(const void *v1, const void *v2)
  {
- 	struct proc **pp1 = (struct proc **) v1;
- 	struct proc **pp2 = (struct proc **) v2;
  	struct kinfo_proc *p1, *p2;
  	int result;
  
--- 686,691 ----
***************
*** 711,718 ****
  static int
  compare_time(const void *v1, const void *v2)
  {
- 	struct proc **pp1 = (struct proc **) v1;
- 	struct proc **pp2 = (struct proc **) v2;
  	struct kinfo_proc *p1, *p2;
  	int result;
  
--- 705,710 ----
***************
*** 732,739 ****
  static int
  compare_prio(const void *v1, const void *v2)
  {
- 	struct proc   **pp1 = (struct proc **) v1;
- 	struct proc   **pp2 = (struct proc **) v2;
  	struct kinfo_proc *p1, *p2;
  	int result;
  
--- 724,729 ----
***************
*** 752,759 ****
  static int
  compare_pid(const void *v1, const void *v2)
  {
- 	struct proc **pp1 = (struct proc **) v1;
- 	struct proc **pp2 = (struct proc **) v2;
  	struct kinfo_proc *p1, *p2;
  	int result;
  
--- 742,747 ----
***************
*** 773,780 ****
  static int
  compare_cmd(const void *v1, const void *v2)
  {
- 	struct proc **pp1 = (struct proc **) v1;
- 	struct proc **pp2 = (struct proc **) v2;
  	struct kinfo_proc *p1, *p2;
  	int result;
  
--- 761,766 ----