diff options
| author |   xsa <xsa@openbsd.org> | 2007-06-28 21:38:09 +0000 |
|---|---|---|
| committer | xsa <xsa@openbsd.org> | 2007-06-28 21:38:09 +0000 |
| commit | 0a7da307a320cc44e09a0576ba47e9cd8db3c9a4 (patch) | |
| tree | 5a6c370983856da384df38e16c2982ca05bd26e3 /usr.bin/cvs/diff3.c | |
| parent | When commiting to a server in a remote setup classify (diff) | |
| download | wireguard-openbsd-0a7da307a320cc44e09a0576ba47e9cd8db3c9a4.tar.xz wireguard-openbsd-0a7da307a320cc44e09a0576ba47e9cd8db3c9a4.zip | |
Sync revisions and time buffers size to be consistent with each others.
Simplifies further size tweaks if needed.
OK niallo@ ray@.
Diffstat (limited to 'usr.bin/cvs/diff3.c')
| -rw-r--r-- | usr.bin/cvs/diff3.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/cvs/diff3.c b/usr.bin/cvs/diff3.c index 3479f4f822e..742cd2ccc3e 100644 --- a/usr.bin/cvs/diff3.c +++ b/usr.bin/cvs/diff3.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diff3.c,v 1.36 2007/05/29 00:19:10 ray Exp $ */ +/* $OpenBSD: diff3.c,v 1.37 2007/06/28 21:38:09 xsa Exp $ */ /* * Copyright (C) Caldera International Inc. 2001-2002. @@ -72,7 +72,7 @@ static const char copyright[] = #ifndef lint static const char rcsid[] = - "$OpenBSD: diff3.c,v 1.36 2007/05/29 00:19:10 ray Exp $"; + "$OpenBSD: diff3.c,v 1.37 2007/06/28 21:38:09 xsa Exp $"; #endif /* not lint */ #include <ctype.h> @@ -163,7 +163,7 @@ cvs_merge_file(struct cvs_file *cf, int verbose) { int argc; char *data, *patch; - char *argv[5], r1[16], r2[16]; + char *argv[5], r1[CVS_REV_BUFSZ], r2[CVS_REV_BUFSZ]; char *dp13, *dp23, *path1, *path2, *path3; BUF *b1, *b2, *b3, *d1, *d2, *diffb; size_t dlen, plen; |