summaryrefslogtreecommitdiff
path: root/usr.bin/rcs/rcsmerge.c
diff options
context:
space:
mode:
authorXavier Santolaria <xsa@cvs.openbsd.org>2006-05-08 09:59:10 +0000
committerXavier Santolaria <xsa@cvs.openbsd.org>2006-05-08 09:59:10 +0000
commitbcf7d56f36b81c034316d13dae682715f0090d91 (patch)
tree445f1680776706b318862725cbf85512f3a8d1f4 /usr.bin/rcs/rcsmerge.c
parentdd28ef8a71d1e784b07abb66ed629e05e1bc5334 (diff)
err() and errx() should also exit with status 2;
Diffstat (limited to 'usr.bin/rcs/rcsmerge.c')
-rw-r--r--usr.bin/rcs/rcsmerge.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/rcs/rcsmerge.c b/usr.bin/rcs/rcsmerge.c
index f2bc54ae029..c99024cb4c9 100644
--- a/usr.bin/rcs/rcsmerge.c
+++ b/usr.bin/rcs/rcsmerge.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rcsmerge.c,v 1.38 2006/05/08 09:48:12 xsa Exp $ */
+/* $OpenBSD: rcsmerge.c,v 1.39 2006/05/08 09:59:09 xsa Exp $ */
/*
* Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org>
* All rights reserved.
@@ -128,11 +128,11 @@ rcsmerge_main(int argc, char **argv)
rev1 = rcsnum_alloc();
rcsnum_cpy(file->rf_head, rev1, 0);
} else if ((rev1 = rcs_getrevnum(rev_str1, file)) == NULL)
- errx(1, "invalid revision: %s", rev_str1);
+ errx(D_ERROR, "invalid revision: %s", rev_str1);
if (rev_str2 != NULL && strcmp(rev_str2, "") != 0) {
if ((rev2 = rcs_getrevnum(rev_str2, file)) == NULL)
- errx(1, "invalid revision: %s", rev_str2);
+ errx(D_ERROR, "invalid revision: %s", rev_str2);
} else {
rev2 = rcsnum_alloc();
rcsnum_cpy(file->rf_head, rev2, 0);