===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/uniq/uniq.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -c -r1.9 -r1.10
*** src/usr.bin/uniq/uniq.c	2002/02/16 21:27:56	1.9
--- src/usr.bin/uniq/uniq.c	2002/07/13 06:04:24	1.10
***************
*** 1,4 ****
! /*	$OpenBSD: uniq.c,v 1.9 2002/02/16 21:27:56 millert Exp $	*/
  /*	$NetBSD: uniq.c,v 1.7 1995/08/31 22:03:48 jtc Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: uniq.c,v 1.10 2002/07/13 06:04:24 deraadt Exp $	*/
  /*	$NetBSD: uniq.c,v 1.7 1995/08/31 22:03:48 jtc Exp $	*/
  
  /*
***************
*** 47,53 ****
  #if 0
  static char sccsid[] = "@(#)uniq.c	8.3 (Berkeley) 5/4/95";
  #endif
! static char rcsid[] = "$OpenBSD: uniq.c,v 1.9 2002/02/16 21:27:56 millert Exp $";
  #endif /* not lint */
  
  #include <errno.h>
--- 47,53 ----
  #if 0
  static char sccsid[] = "@(#)uniq.c	8.3 (Berkeley) 5/4/95";
  #endif
! static char rcsid[] = "$OpenBSD: uniq.c,v 1.10 2002/07/13 06:04:24 deraadt Exp $";
  #endif /* not lint */
  
  #include <errno.h>
***************
*** 70,81 ****
  void	 usage(void);
  
  int
! main (argc, argv)
! 	int argc;
! 	char *argv[];
  {
  	char *t1, *t2;
! 	FILE *ifp, *ofp;
  	int ch;
  	char *prevline, *thisline, *p;
  
--- 70,79 ----
  void	 usage(void);
  
  int
! main(int argc, char *argv[])
  {
  	char *t1, *t2;
! 	FILE *ifp = NULL, *ofp = NULL;
  	int ch;
  	char *prevline, *thisline, *p;
  
***************
*** 174,182 ****
   *	of the line.
   */
  void
! show(ofp, str)
! 	FILE *ofp;
! 	char *str;
  {
  
  	if (cflag && *str)
--- 172,178 ----
   *	of the line.
   */
  void
! show(FILE *ofp, char *str)
  {
  
  	if (cflag && *str)
***************
*** 186,193 ****
  }
  
  char *
! skip(str)
! 	char *str;
  {
  	int infield, nchars, nfields;
  
--- 182,188 ----
  }
  
  char *
! skip(char *str)
  {
  	int infield, nchars, nfields;
  
***************
*** 204,211 ****
  }
  
  FILE *
! file(name, mode)
! 	char *name, *mode;
  {
  	FILE *fp;
  
--- 199,205 ----
  }
  
  FILE *
! file(char *name, char *mode)
  {
  	FILE *fp;
  
***************
*** 215,222 ****
  }
  
  void
! obsolete(argv)
! 	char *argv[];
  {
  	int len;
  	char *ap, *p, *start;
--- 209,215 ----
  }
  
  void
! obsolete(char *argv[])
  {
  	int len;
  	char *ap, *p, *start;
***************
*** 245,251 ****
  }
  
  void
! usage()
  {
  	(void)fprintf(stderr,
  	    "usage: uniq [-c | -du] [-f fields] [-s chars] [input [output]]\n");
--- 238,244 ----
  }
  
  void
! usage(void)
  {
  	(void)fprintf(stderr,
  	    "usage: uniq [-c | -du] [-f fields] [-s chars] [input [output]]\n");