===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/systat/iostat.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -c -r1.17 -r1.18
*** src/usr.bin/systat/iostat.c	2002/02/16 21:27:54	1.17
--- src/usr.bin/systat/iostat.c	2002/06/18 00:46:47	1.18
***************
*** 1,4 ****
! /*	$OpenBSD: iostat.c,v 1.17 2002/02/16 21:27:54 millert Exp $	*/
  /*	$NetBSD: iostat.c,v 1.5 1996/05/10 23:16:35 thorpej Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: iostat.c,v 1.18 2002/06/18 00:46:47 deraadt Exp $	*/
  /*	$NetBSD: iostat.c,v 1.5 1996/05/10 23:16:35 thorpej Exp $	*/
  
  /*
***************
*** 38,44 ****
  #if 0
  static char sccsid[] = "@(#)iostat.c	8.1 (Berkeley) 6/6/93";
  #endif
! static char rcsid[] = "$OpenBSD: iostat.c,v 1.17 2002/02/16 21:27:54 millert Exp $";
  #endif /* not lint */
  
  #include <sys/param.h>
--- 38,44 ----
  #if 0
  static char sccsid[] = "@(#)iostat.c	8.1 (Berkeley) 6/6/93";
  #endif
! static char rcsid[] = "$OpenBSD: iostat.c,v 1.18 2002/06/18 00:46:47 deraadt Exp $";
  #endif /* not lint */
  
  #include <sys/param.h>
***************
*** 68,81 ****
  
  
  WINDOW *
! openiostat()
  {
  	return (subwin(stdscr, LINES-1-5, 0, 5, 0));
  }
  
  void
! closeiostat(w)
! 	WINDOW *w;
  {
  	if (w == NULL)
  		return;
--- 68,80 ----
  
  
  WINDOW *
! openiostat(void)
  {
  	return (subwin(stdscr, LINES-1-5, 0, 5, 0));
  }
  
  void
! closeiostat(WINDOW *w)
  {
  	if (w == NULL)
  		return;
***************
*** 85,91 ****
  }
  
  int
! initiostat()
  {
  	dkinit(1);
  	dkreadstats();
--- 84,90 ----
  }
  
  int
! initiostat(void)
  {
  	dkinit(1);
  	dkreadstats();
***************
*** 93,99 ****
  }
  
  void
! fetchiostat()
  {
  	if (dk_ndrive == 0)
  		return;
--- 92,98 ----
  }
  
  void
! fetchiostat(void)
  {
  	if (dk_ndrive == 0)
  		return;
***************
*** 103,109 ****
  #define	INSET	10
  
  void
! labeliostat()
  {
  	int row;
  
--- 102,108 ----
  #define	INSET	10
  
  void
! labeliostat(void)
  {
  	int row;
  
***************
*** 123,130 ****
  }
  
  static int
! numlabels(row)
! 	int row;
  {
  	int i, col, regions, ndrives;
  
--- 122,128 ----
  }
  
  static int
! numlabels(int row)
  {
  	int i, col, regions, ndrives;
  
***************
*** 166,173 ****
  }
  
  static int
! barlabels(row)
! 	int row;
  {
  	int i;
  
--- 164,170 ----
  }
  
  static int
! barlabels(int row)
  {
  	int i;
  
***************
*** 192,205 ****
  
  
  void
! showiostat()
  {
  	int i, row, col;
  
  	dkswap();
  
  	etime = 0;
! 	for(i = 0; i < CPUSTATES; i++) {
  		etime += cur.cp_time[i];
  	}
  	if (etime == 0.0)
--- 189,202 ----
  
  
  void
! showiostat(void)
  {
  	int i, row, col;
  
  	dkswap();
  
  	etime = 0;
! 	for (i = 0; i < CPUSTATES; i++) {
  		etime += cur.cp_time[i];
  	}
  	if (etime == 0.0)
***************
*** 248,255 ****
  }
  
  static int
! stats(row, col, dn)
! 	int row, col, dn;
  {
  	double atime, words;
  
--- 245,251 ----
  }
  
  static int
! stats(int row, int col, int dn)
  {
  	double atime, words;
  
***************
*** 276,283 ****
  }
  
  static void
! stat1(row, o)
! 	int row, o;
  {
  	int i;
  	double time;
--- 272,278 ----
  }
  
  static void
! stat1(int row, int o)
  {
  	int i;
  	double time;
***************
*** 293,302 ****
  }
  
  static void
! histogram(val, colwidth, scale)
! 	double val;
! 	int colwidth;
! 	double scale;
  {
  	char buf[10];
  	int k;
--- 288,294 ----
  }
  
  static void
! histogram(double val, int colwidth, double scale)
  {
  	char buf[10];
  	int k;
***************
*** 318,325 ****
  }
  
  int
! cmdiostat(cmd, args)
! 	char *cmd, *args;
  {
  
  	if (prefix(cmd, "secs"))
--- 310,316 ----
  }
  
  int
! cmdiostat(char *cmd, char *args)
  {
  
  	if (prefix(cmd, "secs"))