===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/vmstat/vmstat.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -c -r1.90 -r1.91
*** src/usr.bin/vmstat/vmstat.c	2004/09/23 21:09:39	1.90
--- src/usr.bin/vmstat/vmstat.c	2004/09/23 22:55:06	1.91
***************
*** 1,5 ****
  /*	$NetBSD: vmstat.c,v 1.29.4.1 1996/06/05 00:21:05 cgd Exp $	*/
! /*	$OpenBSD: vmstat.c,v 1.90 2004/09/23 21:09:39 deraadt Exp $	*/
  
  /*
   * Copyright (c) 1980, 1986, 1991, 1993
--- 1,5 ----
  /*	$NetBSD: vmstat.c,v 1.29.4.1 1996/06/05 00:21:05 cgd Exp $	*/
! /*	$OpenBSD: vmstat.c,v 1.91 2004/09/23 22:55:06 deraadt Exp $	*/
  
  /*
   * Copyright (c) 1980, 1986, 1991, 1993
***************
*** 40,46 ****
  #if 0
  static char sccsid[] = "@(#)vmstat.c	8.1 (Berkeley) 6/6/93";
  #else
! static const char rcsid[] = "$OpenBSD: vmstat.c,v 1.90 2004/09/23 21:09:39 deraadt Exp $";
  #endif
  #endif /* not lint */
  
--- 40,46 ----
  #if 0
  static char sccsid[] = "@(#)vmstat.c	8.1 (Berkeley) 6/6/93";
  #else
! static const char rcsid[] = "$OpenBSD: vmstat.c,v 1.91 2004/09/23 22:55:06 deraadt Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 745,751 ****
  		return;
  	}
  
! 	(void)printf("%-12s %20s %8s\n", "interrupt", "total", "rate");
  
  	inttotal = 0;
  	for (i = 0; i < nintr; i++) {
--- 745,751 ----
  		return;
  	}
  
! 	(void)printf("%-16s %20s %8s\n", "interrupt", "total", "rate");
  
  	inttotal = 0;
  	for (i = 0; i < nintr; i++) {
***************
*** 786,792 ****
  		}
  
  		if (cnt || zflag)
! 			(void)printf("%-12.12s %20llu %8llu\n", intrname,
  			    cnt, cnt / uptime);
  		inttotal += cnt;
  	}
--- 786,792 ----
  		}
  
  		if (cnt || zflag)
! 			(void)printf("%-16.16s %20llu %8llu\n", intrname,
  			    cnt, cnt / uptime);
  		inttotal += cnt;
  	}
***************
*** 802,815 ****
  			    sizeof dev) != sizeof dev)
  				errx(1, "event chain trashed: %s", kvm_geterr(kd));
  			if (evcnt.ev_count)
! 				(void)printf("%-12.12s %20llu %8llu\n",
  				    dev.dv_xname,
  				    evcnt.ev_count, evcnt.ev_count / uptime);
  			inttotal += evcnt.ev_count;
  		}
  		evptr = evcnt.ev_list.tqe_next;
  	}
! 	(void)printf("%-12s %20llu %8llu\n", "Total", inttotal,
  	    inttotal / uptime);
  }
  
--- 802,815 ----
  			    sizeof dev) != sizeof dev)
  				errx(1, "event chain trashed: %s", kvm_geterr(kd));
  			if (evcnt.ev_count)
! 				(void)printf("%-16.16s %20llu %8llu\n",
  				    dev.dv_xname,
  				    evcnt.ev_count, evcnt.ev_count / uptime);
  			inttotal += evcnt.ev_count;
  		}
  		evptr = evcnt.ev_list.tqe_next;
  	}
! 	(void)printf("%-16s %20llu %8llu\n", "Total", inttotal,
  	    inttotal / uptime);
  }
  
***************
*** 835,846 ****
  		err(1, "malloc");
  	kread(X_INTRCNT, intrcnt, (size_t)nintr);
  	kread(X_INTRNAMES, intrname, (size_t)inamlen);
! 	(void)printf("%-12s %20s %8s\n", "interrupt", "total", "rate");
  	inttotal = 0;
  	nintr /= sizeof(long);
  	while (--nintr >= 0) {
  		if (*intrcnt)
! 			(void)printf("%-12.12s %20lu %8lu\n", intrname,
  			    *intrcnt, *intrcnt / uptime);
  		intrname += strlen(intrname) + 1;
  		inttotal += *intrcnt++;
--- 835,846 ----
  		err(1, "malloc");
  	kread(X_INTRCNT, intrcnt, (size_t)nintr);
  	kread(X_INTRNAMES, intrname, (size_t)inamlen);
! 	(void)printf("%-16s %20s %8s\n", "interrupt", "total", "rate");
  	inttotal = 0;
  	nintr /= sizeof(long);
  	while (--nintr >= 0) {
  		if (*intrcnt)
! 			(void)printf("%-16.16s %20lu %8lu\n", intrname,
  			    *intrcnt, *intrcnt / uptime);
  		intrname += strlen(intrname) + 1;
  		inttotal += *intrcnt++;
***************
*** 856,868 ****
  			    sizeof dev) != sizeof dev)
  				errx(1, "event chain trashed: %s", kvm_geterr(kd));
  			if (evcnt.ev_count)
! 				(void)printf("%-12.12s %20lu %8lu\n", dev.dv_xname,
  				    evcnt.ev_count, evcnt.ev_count / uptime);
  			inttotal += evcnt.ev_count;
  		}
  		evptr = evcnt.ev_list.tqe_next;
  	}
! 	(void)printf("%-12s %20llu %8llu\n", "Total", inttotal,
  	    inttotal / uptime);
  }
  
--- 856,868 ----
  			    sizeof dev) != sizeof dev)
  				errx(1, "event chain trashed: %s", kvm_geterr(kd));
  			if (evcnt.ev_count)
! 				(void)printf("%-16.16s %20lu %8lu\n", dev.dv_xname,
  				    evcnt.ev_count, evcnt.ev_count / uptime);
  			inttotal += evcnt.ev_count;
  		}
  		evptr = evcnt.ev_list.tqe_next;
  	}
! 	(void)printf("%-16s %20llu %8llu\n", "Total", inttotal,
  	    inttotal / uptime);
  }