===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/rcsmerge.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -c -r1.52 -r1.53
*** src/usr.bin/rcs/rcsmerge.c	2010/07/23 21:46:05	1.52
--- src/usr.bin/rcs/rcsmerge.c	2014/10/02 06:23:15	1.53
***************
*** 1,4 ****
! /*	$OpenBSD: rcsmerge.c,v 1.52 2010/07/23 21:46:05 ray Exp $	*/
  /*
   * Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org>
   * All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: rcsmerge.c,v 1.53 2014/10/02 06:23:15 otto Exp $	*/
  /*
   * Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org>
   * All rights reserved.
***************
*** 68,74 ****
  			if (RCS_KWEXP_INVAL(kflag)) {
  				warnx("invalid RCS keyword substitution mode");
  				(usage)();
- 				exit(D_ERROR);
  			}
  			break;
  		case 'p':
--- 68,73 ----
***************
*** 100,106 ****
  			break;
  		default:
  			(usage)();
- 			exit(D_ERROR);
  		}
  	}
  
--- 99,104 ----
***************
*** 110,122 ****
  	if (rev_str1 == NULL) {
  		warnx("no base revision number given");
  		(usage)();
- 		exit(D_ERROR);
  	}
  
  	if (argc < 1) {
  		warnx("no input file");
  		(usage)();
- 		exit(D_ERROR);
  	}
  
  	if (argc > 2 || (argc == 2 && argv[1] != NULL))
--- 108,118 ----
***************
*** 187,196 ****
  	return (status);
  }
  
! void
  rcsmerge_usage(void)
  {
  	fprintf(stderr,
  	    "usage: rcsmerge [-EV] [-kmode] [-p[rev]] [-q[rev]]\n"
  	    "                [-xsuffixes] [-ztz] -rrev file ...\n");
  }
--- 183,194 ----
  	return (status);
  }
  
! __dead void
  rcsmerge_usage(void)
  {
  	fprintf(stderr,
  	    "usage: rcsmerge [-EV] [-kmode] [-p[rev]] [-q[rev]]\n"
  	    "                [-xsuffixes] [-ztz] -rrev file ...\n");
+ 
+ 	exit(D_ERROR);
  }