=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/diff3.c,v retrieving revision 1.21 retrieving revision 1.22 diff -c -r1.21 -r1.22 *** src/usr.bin/rcs/diff3.c 2007/05/29 00:19:10 1.21 --- src/usr.bin/rcs/diff3.c 2007/06/30 08:23:49 1.22 *************** *** 1,4 **** ! /* $OpenBSD: diff3.c,v 1.21 2007/05/29 00:19:10 ray Exp $ */ /* * Copyright (C) Caldera International Inc. 2001-2002. --- 1,4 ---- ! /* $OpenBSD: diff3.c,v 1.22 2007/06/30 08:23:49 xsa Exp $ */ /* * Copyright (C) Caldera International Inc. 2001-2002. *************** *** 72,78 **** #ifndef lint static const char rcsid[] = ! "$OpenBSD: diff3.c,v 1.21 2007/05/29 00:19:10 ray Exp $"; #endif /* not lint */ #include --- 72,78 ---- #ifndef lint static const char rcsid[] = ! "$OpenBSD: diff3.c,v 1.22 2007/06/30 08:23:49 xsa Exp $"; #endif /* not lint */ #include *************** *** 282,288 **** rcs_diff3(RCSFILE *rf, char *workfile, RCSNUM *rev1, RCSNUM *rev2, int flags) { int argc; ! char *argv[5], r1[16], r2[16]; char *dp13, *dp23, *path1, *path2, *path3; BUF *b1, *b2, *b3, *d1, *d2, *diffb; size_t dlen, plen; --- 282,288 ---- rcs_diff3(RCSFILE *rf, char *workfile, RCSNUM *rev1, RCSNUM *rev2, int flags) { int argc; ! char *argv[5], r1[RCS_REV_BUFSZ], r2[RCS_REV_BUFSZ]; char *dp13, *dp23, *path1, *path2, *path3; BUF *b1, *b2, *b3, *d1, *d2, *diffb; size_t dlen, plen;