===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tr/tr.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -c -r1.9 -r1.10
*** src/usr.bin/tr/tr.c	2003/06/03 02:56:20	1.9
--- src/usr.bin/tr/tr.c	2003/06/10 22:20:53	1.10
***************
*** 1,4 ****
! /*	$OpenBSD: tr.c,v 1.9 2003/06/03 02:56:20 millert Exp $	*/
  /*	$NetBSD: tr.c,v 1.5 1995/08/31 22:13:48 jtc Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: tr.c,v 1.10 2003/06/10 22:20:53 deraadt Exp $	*/
  /*	$NetBSD: tr.c,v 1.5 1995/08/31 22:13:48 jtc Exp $	*/
  
  /*
***************
*** 40,46 ****
  #if 0
  static char sccsid[] = "@(#)tr.c	8.2 (Berkeley) 5/4/95";
  #endif
! static char rcsid[] = "$OpenBSD: tr.c,v 1.9 2003/06/03 02:56:20 millert Exp $";
  #endif /* not lint */
  
  #include <sys/types.h>
--- 40,46 ----
  #if 0
  static char sccsid[] = "@(#)tr.c	8.2 (Berkeley) 5/4/95";
  #endif
! static char rcsid[] = "$OpenBSD: tr.c,v 1.10 2003/06/10 22:20:53 deraadt Exp $";
  #endif /* not lint */
  
  #include <sys/types.h>
***************
*** 95,103 ****
  static void usage(void);
  
  int
! main(argc, argv)
! 	int argc;
! 	char **argv;
  {
  	int ch, cnt, lastch, *p;
  	int cflag, dflag, sflag, isstring2;
--- 95,101 ----
  static void usage(void);
  
  int
! main(int argc, char *argv[])
  {
  	int ch, cnt, lastch, *p;
  	int cflag, dflag, sflag, isstring2;
***************
*** 237,247 ****
  }
  
  static void
! setup(string, arg, str, cflag)
! 	int *string;
! 	char *arg;
! 	STR *str;
! 	int cflag;
  {
  	int cnt, *p;
  
--- 235,241 ----
  }
  
  static void
! setup(int *string, char *arg, STR *str, int cflag)
  {
  	int cnt, *p;
  
***************
*** 255,261 ****
  }
  
  static void
! usage()
  {
  	(void)fprintf(stderr, "usage: tr [-cs] string1 string2\n");
  	(void)fprintf(stderr, "       tr [-c] -d string1\n");
--- 249,255 ----
  }
  
  static void
! usage(void)
  {
  	(void)fprintf(stderr, "usage: tr [-cs] string1 string2\n");
  	(void)fprintf(stderr, "       tr [-c] -d string1\n");