===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/systat/vmstat.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -c -r1.37 -r1.38
*** src/usr.bin/systat/vmstat.c	2002/12/16 01:57:04	1.37
--- src/usr.bin/systat/vmstat.c	2003/02/28 21:29:07	1.38
***************
*** 1,4 ****
! /*	$OpenBSD: vmstat.c,v 1.37 2002/12/16 01:57:04 tdeval Exp $	*/
  /*	$NetBSD: vmstat.c,v 1.5 1996/05/10 23:16:40 thorpej Exp $	*/
  
  /*-
--- 1,4 ----
! /*	$OpenBSD: vmstat.c,v 1.38 2003/02/28 21:29:07 jason Exp $	*/
  /*	$NetBSD: vmstat.c,v 1.5 1996/05/10 23:16:40 thorpej Exp $	*/
  
  /*-
***************
*** 38,44 ****
  #if 0
  static char sccsid[] = "@(#)vmstat.c	8.2 (Berkeley) 1/12/94";
  #endif
! static char rcsid[] = "$OpenBSD: vmstat.c,v 1.37 2002/12/16 01:57:04 tdeval Exp $";
  #endif /* not lint */
  
  /*
--- 38,44 ----
  #if 0
  static char sccsid[] = "@(#)vmstat.c	8.2 (Berkeley) 1/12/94";
  #endif
! static char rcsid[] = "$OpenBSD: vmstat.c,v 1.38 2003/02/28 21:29:07 jason Exp $";
  #endif /* not lint */
  
  /*
***************
*** 82,88 ****
  	struct	vmtotal Total;
  	struct	nchstats nchstats;
  	long	nchcount;
! 	long	*intrcnt;
  } s, s1, s2, z;
  
  #include "dkstats.h"
--- 82,88 ----
  	struct	vmtotal Total;
  	struct	nchstats nchstats;
  	long	nchcount;
! 	int	*intrcnt;
  } s, s1, s2, z;
  
  #include "dkstats.h"
***************
*** 233,239 ****
  		}
  #else
  		nintr = (namelist[X_EINTRCNT].n_value -
! 		    namelist[X_INTRCNT].n_value) / sizeof (long);
  		intrloc = calloc(nintr, sizeof (long));
  		intrname = calloc(nintr, sizeof (long));
  		intrnamebuf = malloc(namelist[X_EINTRNAMES].n_value -
--- 233,239 ----
  		}
  #else
  		nintr = (namelist[X_EINTRCNT].n_value -
! 		    namelist[X_INTRCNT].n_value) / sizeof (int);
  		intrloc = calloc(nintr, sizeof (long));
  		intrname = calloc(nintr, sizeof (long));
  		intrnamebuf = malloc(namelist[X_EINTRNAMES].n_value -
***************
*** 648,654 ****
  		}
  	}
  #else
! 	NREAD(X_INTRCNT, s->intrcnt, nintr * sizeof(long));
  #endif
  	size = sizeof(s->time);
  	if (sysctl(cp_time_mib, 2, &s->time, &size, NULL, 0) < 0) {
--- 648,654 ----
  		}
  	}
  #else
! 	NREAD(X_INTRCNT, s->intrcnt, nintr * sizeof(int));
  #endif
  	size = sizeof(s->time);
  	if (sysctl(cp_time_mib, 2, &s->time, &size, NULL, 0) < 0) {
***************
*** 679,685 ****
  allocinfo(struct Info *s)
  {
  
! 	s->intrcnt = (long *) malloc(nintr * sizeof(long));
  	if (s->intrcnt == NULL)
  		errx(2, "out of memory");
  }
--- 679,685 ----
  allocinfo(struct Info *s)
  {
  
! 	s->intrcnt = (int *) malloc(nintr * sizeof(int));
  	if (s->intrcnt == NULL)
  		errx(2, "out of memory");
  }
***************
*** 687,693 ****
  static void
  copyinfo(struct Info *from, struct Info *to)
  {
! 	long *intrcnt;
  
  	intrcnt = to->intrcnt;
  	*to = *from;
--- 687,693 ----
  static void
  copyinfo(struct Info *from, struct Info *to)
  {
! 	int *intrcnt;
  
  	intrcnt = to->intrcnt;
  	*to = *from;