===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/col/col.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -c -r1.8 -r1.9
*** src/usr.bin/col/col.c	2003/06/03 02:56:06	1.8
--- src/usr.bin/col/col.c	2003/06/10 22:20:45	1.9
***************
*** 1,4 ****
! /*	$OpenBSD: col.c,v 1.8 2003/06/03 02:56:06 millert Exp $	*/
  /*	$NetBSD: col.c,v 1.7 1995/09/02 05:48:50 jtc Exp $	*/
  
  /*-
--- 1,4 ----
! /*	$OpenBSD: col.c,v 1.9 2003/06/10 22:20:45 deraadt Exp $	*/
  /*	$NetBSD: col.c,v 1.7 1995/09/02 05:48:50 jtc Exp $	*/
  
  /*-
***************
*** 43,49 ****
  #if 0
  static char sccsid[] = "@(#)col.c	8.5 (Berkeley) 5/4/95";
  #endif
! static char rcsid[] = "$OpenBSD: col.c,v 1.8 2003/06/03 02:56:06 millert Exp $";
  #endif /* not lint */
  
  #include <ctype.h>
--- 43,49 ----
  #if 0
  static char sccsid[] = "@(#)col.c	8.5 (Berkeley) 5/4/95";
  #endif
! static char rcsid[] = "$OpenBSD: col.c,v 1.9 2003/06/10 22:20:45 deraadt Exp $";
  #endif /* not lint */
  
  #include <ctype.h>
***************
*** 112,120 ****
  		err(1, "stdout");
  
  int
! main(argc, argv)
! 	int argc;
! 	char **argv;
  {
  	int ch;
  	CHAR *c;
--- 112,118 ----
  		err(1, "stdout");
  
  int
! main(int argc, char *argv[])
  {
  	int ch;
  	CHAR *c;
***************
*** 320,327 ****
  }
  
  void
! flush_lines(nflush)
! 	int nflush;
  {
  	LINE *l;
  
--- 318,324 ----
  }
  
  void
! flush_lines(int nflush)
  {
  	LINE *l;
  
***************
*** 347,353 ****
   * feeds.
   */
  void
! flush_blanks()
  {
  	int half, i, nb;
  
--- 344,350 ----
   * feeds.
   */
  void
! flush_blanks(void)
  {
  	int half, i, nb;
  
***************
*** 376,383 ****
   * and character set shifts.
   */
  void
! flush_line(l)
! 	LINE *l;
  {
  	CHAR *c, *endc;
  	int nchars, last_col, this_col;
--- 373,379 ----
   * and character set shifts.
   */
  void
! flush_line(LINE *l)
  {
  	CHAR *c, *endc;
  	int nchars, last_col, this_col;
***************
*** 476,482 ****
  static LINE *line_freelist;
  
  LINE *
! alloc_line()
  {
  	LINE *l;
  	int i;
--- 472,478 ----
  static LINE *line_freelist;
  
  LINE *
! alloc_line(void)
  {
  	LINE *l;
  	int i;
***************
*** 496,503 ****
  }
  
  void
! free_line(l)
! 	LINE *l;
  {
  
  	l->l_next = line_freelist;
--- 492,498 ----
  }
  
  void
! free_line(LINE *l)
  {
  
  	l->l_next = line_freelist;
***************
*** 505,513 ****
  }
  
  void *
! xmalloc(p, size)
! 	void *p;
! 	size_t size;
  {
  
  	if (!(p = (void *)realloc(p, size)))
--- 500,506 ----
  }
  
  void *
! xmalloc(void *p, size_t size)
  {
  
  	if (!(p = (void *)realloc(p, size)))
***************
*** 516,530 ****
  }
  
  void
! usage()
  {
  	(void)fprintf(stderr, "usage: col [-bfhx] [-l num]\n");
  	exit(1);
  }
  
  void
! dowarn(line)
! 	int line;
  {
  
  	warnx("warning: can't back up %s",
--- 509,522 ----
  }
  
  void
! usage(void)
  {
  	(void)fprintf(stderr, "usage: col [-bfhx] [-l num]\n");
  	exit(1);
  }
  
  void
! dowarn(int line)
  {
  
  	warnx("warning: can't back up %s",