===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/expand/expand.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -c -r1.5 -r1.6
*** src/usr.bin/expand/expand.c	2003/06/03 02:56:07	1.5
--- src/usr.bin/expand/expand.c	2003/06/10 22:20:46	1.6
***************
*** 1,4 ****
! /*	$OpenBSD: expand.c,v 1.5 2003/06/03 02:56:07 millert Exp $	*/
  /*	$NetBSD: expand.c,v 1.5 1995/09/02 06:19:46 jtc Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: expand.c,v 1.6 2003/06/10 22:20:46 deraadt Exp $	*/
  /*	$NetBSD: expand.c,v 1.5 1995/09/02 06:19:46 jtc Exp $	*/
  
  /*
***************
*** 40,46 ****
  #if 0
  static char sccsid[] = "@(#)expand.c	8.1 (Berkeley) 6/9/93";
  #endif
! static char rcsid[] = "$OpenBSD: expand.c,v 1.5 2003/06/03 02:56:07 millert Exp $";
  #endif /* not lint */
  
  #include <stdio.h>
--- 40,46 ----
  #if 0
  static char sccsid[] = "@(#)expand.c	8.1 (Berkeley) 6/9/93";
  #endif
! static char rcsid[] = "$OpenBSD: expand.c,v 1.6 2003/06/10 22:20:46 deraadt Exp $";
  #endif /* not lint */
  
  #include <stdio.h>
***************
*** 58,66 ****
  static void usage();
  
  int
! main(argc, argv)
! 	int argc;
! 	char *argv[];
  {
  	int c, column;
  	int n;
--- 58,64 ----
  static void usage();
  
  int
! main(int argc, char *argv[])
  {
  	int c, column;
  	int n;
***************
*** 108,114 ****
  					do {
  						putchar(' ');
  						column++;
! 					} while (((column - 1) % tabstops[0]) != (tabstops[0] - 1));
  					continue;
  				}
  				for (n = 0; n < nstops; n++)
--- 106,113 ----
  					do {
  						putchar(' ');
  						column++;
! 					} while (((column - 1) %
! 					    tabstops[0]) != (tabstops[0] - 1));
  					continue;
  				}
  				for (n = 0; n < nstops; n++)
***************
*** 147,154 ****
  }
  
  static void
! getstops(cp)
! 	char *cp;
  {
  	int i;
  
--- 146,152 ----
  }
  
  static void
! getstops(char *cp)
  {
  	int i;
  
***************
*** 174,180 ****
  }
  
  static void
! usage()
  {
  	(void)fprintf (stderr, "usage: expand [-t tablist] [file ...]\n");
  	exit(1);
--- 172,178 ----
  }
  
  static void
! usage(void)
  {
  	(void)fprintf (stderr, "usage: expand [-t tablist] [file ...]\n");
  	exit(1);