===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ul/ul.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -c -r1.9 -r1.10
*** src/usr.bin/ul/ul.c	2003/06/03 02:56:20	1.9
--- src/usr.bin/ul/ul.c	2003/06/10 22:20:53	1.10
***************
*** 1,4 ****
! /*	$OpenBSD: ul.c,v 1.9 2003/06/03 02:56:20 millert Exp $	*/
  /*	$NetBSD: ul.c,v 1.3 1994/12/07 00:28:24 jtc Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: ul.c,v 1.10 2003/06/10 22:20:53 deraadt Exp $	*/
  /*	$NetBSD: ul.c,v 1.3 1994/12/07 00:28:24 jtc Exp $	*/
  
  /*
***************
*** 40,46 ****
  #if 0
  static char sccsid[] = "@(#)ul.c	8.1 (Berkeley) 6/6/93";
  #endif
! static char rcsid[] = "$OpenBSD: ul.c,v 1.9 2003/06/03 02:56:20 millert Exp $";
  #endif /* not lint */
  
  #include <stdio.h>
--- 40,46 ----
  #if 0
  static char sccsid[] = "@(#)ul.c	8.1 (Berkeley) 6/6/93";
  #endif
! static char rcsid[] = "$OpenBSD: ul.c,v 1.10 2003/06/10 22:20:53 deraadt Exp $";
  #endif /* not lint */
  
  #include <stdio.h>
***************
*** 102,110 ****
  	} while (0)
  
  int
! main(argc, argv)
! 	int argc;
! 	char **argv;
  {
  	extern int optind;
  	extern char *optarg;
--- 102,108 ----
  	} while (0)
  
  int
! main(int argc, char *argv[])
  {
  	extern int optind;
  	extern char *optarg;
***************
*** 170,177 ****
  }
  
  void
! mfilter(f)
! 	FILE *f;
  {
  	int c;
  
--- 168,174 ----
  }
  
  void
! mfilter(FILE *f)
  {
  	int c;
  
***************
*** 284,290 ****
  }
  
  void
! flushln()
  {
  	int lastmode, i;
  	int hadmodes = 0;
--- 281,287 ----
  }
  
  void
! flushln(void)
  {
  	int lastmode, i;
  	int hadmodes = 0;
***************
*** 323,329 ****
   * We don't do anything with halfline ups and downs, or Greek.
   */
  void
! overstrike()
  {
  	int i;
  	char lbuf[256];
--- 320,326 ----
   * We don't do anything with halfline ups and downs, or Greek.
   */
  void
! overstrike(void)
  {
  	int i;
  	char lbuf[256];
***************
*** 361,367 ****
  }
  
  void
! iattr()
  {
  	int i;
  	char lbuf[256];
--- 358,364 ----
  }
  
  void
! iattr(void)
  {
  	int i;
  	char lbuf[256];
***************
*** 385,391 ****
  }
  
  void
! initbuf()
  {
  
  	bzero((char *)obuf, sizeof (obuf));	/* depends on NORMAL == 0 */
--- 382,388 ----
  }
  
  void
! initbuf(void)
  {
  
  	bzero((char *)obuf, sizeof (obuf));	/* depends on NORMAL == 0 */
***************
*** 395,401 ****
  }
  
  void
! fwd()
  {
  	int oldcol, oldmax;
  
--- 392,398 ----
  }
  
  void
! fwd(void)
  {
  	int oldcol, oldmax;
  
***************
*** 407,413 ****
  }
  
  void
! reverse()
  {
  	upln++;
  	fwd();
--- 404,410 ----
  }
  
  void
! reverse(void)
  {
  	upln++;
  	fwd();
***************
*** 417,423 ****
  }
  
  void
! initcap()
  {
  	static char tcapbuf[512];
  	char *bp = tcapbuf;
--- 414,420 ----
  }
  
  void
! initcap(void)
  {
  	static char tcapbuf[512];
  	char *bp = tcapbuf;
***************
*** 471,478 ****
  }
  
  int
! outchar(c)
! 	int c;
  {
  	putchar(c & 0177);
  	return (0);
--- 468,474 ----
  }
  
  int
! outchar(int c)
  {
  	putchar(c & 0177);
  	return (0);
***************
*** 481,488 ****
  static int curmode = 0;
  
  void
! outc(c)
! 	int c;
  {
  	putchar(c);
  	if (must_use_uc && (curmode&UNDERL)) {
--- 477,483 ----
  static int curmode = 0;
  
  void
! outc(int c)
  {
  	putchar(c);
  	if (must_use_uc && (curmode&UNDERL)) {
***************
*** 492,499 ****
  }
  
  void
! msetmode(newmode)
! 	int newmode;
  {
  	if (!iflag) {
  		if (curmode != NORMAL && newmode != NORMAL)
--- 487,493 ----
  }
  
  void
! msetmode(int newmode)
  {
  	if (!iflag) {
  		if (curmode != NORMAL && newmode != NORMAL)