===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/hexdump/parse.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -c -r1.12 -r1.13
*** src/usr.bin/hexdump/parse.c	2003/06/03 02:56:09	1.12
--- src/usr.bin/hexdump/parse.c	2003/06/12 20:58:09	1.13
***************
*** 1,4 ****
! /*	$OpenBSD: parse.c,v 1.12 2003/06/03 02:56:09 millert Exp $	*/
  /*	$NetBSD: parse.c,v 1.12 2001/12/07 13:37:39 bjh21 Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: parse.c,v 1.13 2003/06/12 20:58:09 deraadt Exp $	*/
  /*	$NetBSD: parse.c,v 1.12 2001/12/07 13:37:39 bjh21 Exp $	*/
  
  /*
***************
*** 32,38 ****
  
  #ifndef lint
  /*static char sccsid[] = "from: @(#)parse.c	5.6 (Berkeley) 3/9/91";*/
! static char rcsid[] = "$OpenBSD: parse.c,v 1.12 2003/06/03 02:56:09 millert Exp $";
  #endif /* not lint */
  
  #include <sys/types.h>
--- 32,38 ----
  
  #ifndef lint
  /*static char sccsid[] = "from: @(#)parse.c	5.6 (Berkeley) 3/9/91";*/
! static char rcsid[] = "$OpenBSD: parse.c,v 1.13 2003/06/12 20:58:09 deraadt Exp $";
  #endif /* not lint */
  
  #include <sys/types.h>
***************
*** 51,58 ****
  FU *endfu;					/* format at end-of-data */
  
  void
! addfile(name)
! 	char *name;
  {
  	char *p;
  	FILE *fp;
--- 51,57 ----
  FU *endfu;					/* format at end-of-data */
  
  void
! addfile(char *name)
  {
  	char *p;
  	FILE *fp;
***************
*** 77,84 ****
  }
  
  void
! add(fmt)
! 	const char *fmt;
  {
  	const char *p;
  	static FS **nextfs;
--- 76,82 ----
  }
  
  void
! add(const char *fmt)
  {
  	const char *p;
  	static FS **nextfs;
***************
*** 152,159 ****
  static const char *spec = ".#-+ 0123456789";
  
  int
! size(fs)
! 	FS *fs;
  {
  	FU *fu;
  	int bcnt, cursize;
--- 150,156 ----
  static const char *spec = ".#-+ 0123456789";
  
  int
! size(FS *fs)
  {
  	FU *fu;
  	int bcnt, cursize;
***************
*** 206,213 ****
  }
  
  void
! rewrite(fs)
! 	FS *fs;
  {
  	enum { NOTOKAY, USEBCNT, USEPREC } sokay;
  	PR *pr, **nextpr;
--- 203,209 ----
  }
  
  void
! rewrite(FS *fs)
  {
  	enum { NOTOKAY, USEBCNT, USEPREC } sokay;
  	PR *pr, **nextpr;
***************
*** 447,454 ****
  }
  
  void
! escape(p1)
! 	char *p1;
  {
  	char *p2;
  
--- 443,449 ----
  }
  
  void
! escape(char *p1)
  {
  	char *p2;
  
***************
*** 490,517 ****
  }
  
  void
! badcnt(s)
! 	char *s;
  {
  	errx(1, "%s: bad byte count", s);
  }
  
  void
! badsfmt()
  {
  	errx(1, "%%s: requires a precision or a byte count");
  }
  
  void
! badfmt(fmt)
! 	const char *fmt;
  {
  	errx(1, "\"%s\": bad format", fmt);
  }
  
  void
! badconv(ch)
! 	char *ch;
  {
  	errx(1, "%%%s: bad conversion character", ch);
  }
--- 485,509 ----
  }
  
  void
! badcnt(char *s)
  {
  	errx(1, "%s: bad byte count", s);
  }
  
  void
! badsfmt(void)
  {
  	errx(1, "%%s: requires a precision or a byte count");
  }
  
  void
! badfmt(const char *fmt)
  {
  	errx(1, "\"%s\": bad format", fmt);
  }
  
  void
! badconv(char *ch)
  {
  	errx(1, "%%%s: bad conversion character", ch);
  }