summaryrefslogtreecommitdiff
path: root/usr.bin/rcs/rcsmerge.c
diff options
context:
space:
mode:
authorXavier Santolaria <xsa@cvs.openbsd.org>2007-06-30 08:23:50 +0000
committerXavier Santolaria <xsa@cvs.openbsd.org>2007-06-30 08:23:50 +0000
commit49b62627be018dc16a5864f774be94fbcedf2e34 (patch)
tree0ffcffb2214325cd32f28473fc048ade0c0cfdc1 /usr.bin/rcs/rcsmerge.c
parentb943dde4f8c6cd4a744f87122fb3192a5ba1cb3f (diff)
Sync revisions and time buffers size to be consistent with each others.
Simplifies further size tweaks if needed. OK ray@.
Diffstat (limited to 'usr.bin/rcs/rcsmerge.c')
-rw-r--r--usr.bin/rcs/rcsmerge.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/rcs/rcsmerge.c b/usr.bin/rcs/rcsmerge.c
index ba0e93cf0d5..9b57b23be80 100644
--- a/usr.bin/rcs/rcsmerge.c
+++ b/usr.bin/rcs/rcsmerge.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rcsmerge.c,v 1.50 2007/02/27 07:59:13 xsa Exp $ */
+/* $OpenBSD: rcsmerge.c,v 1.51 2007/06/30 08:23:49 xsa Exp $ */
/*
* Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org>
* All rights reserved.
@@ -37,7 +37,8 @@ int
rcsmerge_main(int argc, char **argv)
{
int fd, ch, flags, kflag, status;
- char fpath[MAXPATHLEN], r1[16], r2[16], *rev_str1, *rev_str2;
+ char fpath[MAXPATHLEN], r1[RCS_REV_BUFSZ], r2[RCS_REV_BUFSZ];
+ char *rev_str1, *rev_str2;
RCSFILE *file;
RCSNUM *rev1, *rev2;
BUF *bp;