===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/hexdump/display.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -c -r1.11 -r1.12
*** src/usr.bin/hexdump/display.c	2003/06/03 02:56:09	1.11
--- src/usr.bin/hexdump/display.c	2003/06/12 20:58:09	1.12
***************
*** 1,4 ****
! /*	$OpenBSD: display.c,v 1.11 2003/06/03 02:56:09 millert Exp $	*/
  /*	$NetBSD: display.c,v 1.12 2001/12/07 15:14:29 bjh21 Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: display.c,v 1.12 2003/06/12 20:58:09 deraadt Exp $	*/
  /*	$NetBSD: display.c,v 1.12 2001/12/07 15:14:29 bjh21 Exp $	*/
  
  /*
***************
*** 32,38 ****
  
  #ifndef lint
  /*static char sccsid[] = "from: @(#)display.c	5.11 (Berkeley) 3/9/91";*/
! static char rcsid[] = "$OpenBSD: display.c,v 1.11 2003/06/03 02:56:09 millert Exp $";
  #endif /* not lint */
  
  #include <sys/param.h>
--- 32,38 ----
  
  #ifndef lint
  /*static char sccsid[] = "from: @(#)display.c	5.11 (Berkeley) 3/9/91";*/
! static char rcsid[] = "$OpenBSD: display.c,v 1.12 2003/06/12 20:58:09 deraadt Exp $";
  #endif /* not lint */
  
  #include <sys/param.h>
***************
*** 56,62 ****
  static inline void print(PR *, u_char *);
  
  void
! display()
  {
  	FS *fs;
  	FU *fu;
--- 56,62 ----
  static inline void print(PR *, u_char *);
  
  void
! display(void)
  {
  	FS *fs;
  	FU *fu;
***************
*** 111,119 ****
  }
  
  static inline void
! print(pr, bp)
! 	PR *pr;
! 	u_char *bp;
  {
  	   double f8;
  	    float f4;
--- 111,117 ----
  }
  
  static inline void
! print(PR *pr, u_char *bp)
  {
  	   double f8;
  	    float f4;
***************
*** 203,210 ****
  }
  
  void
! bpad(pr)
! 	PR *pr;
  {
  	static const char *spec = " -0+#";
  	char *p1, *p2;
--- 201,207 ----
  }
  
  void
! bpad(PR *pr)
  {
  	static const char *spec = " -0+#";
  	char *p1, *p2;
***************
*** 224,230 ****
  static char **_argv;
  
  u_char *
! get()
  {
  	static int ateof = 1;
  	static u_char *curp, *savp;
--- 221,227 ----
  static char **_argv;
  
  u_char *
! get(void)
  {
  	static int ateof = 1;
  	static u_char *curp, *savp;
***************
*** 291,298 ****
  }
  
  int
! next(argv)
! 	char **argv;
  {
  	static int done;
  	int statok;
--- 288,294 ----
  }
  
  int
! next(char **argv)
  {
  	static int done;
  	int statok;
***************
*** 326,334 ****
  }
  
  void
! doskip(fname, statok)
! 	const char *fname;
! 	int statok;
  {
  	int cnt;
  	struct stat sb;
--- 322,328 ----
  }
  
  void
! doskip(const char *fname, int statok)
  {
  	int cnt;
  	struct stat sb;
***************
*** 357,364 ****
  }
  
  void *
! emalloc(allocsize)
! 	int allocsize;
  {
  	void *p;
  
--- 351,357 ----
  }
  
  void *
! emalloc(int allocsize)
  {
  	void *p;
  
***************
*** 369,375 ****
  }
  
  void
! nomem()
  {
  	err(1, NULL);
  }
--- 362,368 ----
  }
  
  void
! nomem(void)
  {
  	err(1, NULL);
  }