diff options
| author |   joris <joris@openbsd.org> | 2005-10-23 04:03:58 +0000 |
|---|---|---|
| committer | joris <joris@openbsd.org> | 2005-10-23 04:03:58 +0000 |
| commit | 154523eab370a172324d38243a43cd382a40d3d3 (patch) | |
| tree | b11a0cb1f22325be39b4712daffd99821b70ff4d /usr.bin/cvs/diff3.c | |
| parent | - correctly terminate buffer in edscript(), noted by pedro@ (diff) | |
| download | wireguard-openbsd-154523eab370a172324d38243a43cd382a40d3d3.tar.xz wireguard-openbsd-154523eab370a172324d38243a43cd382a40d3d3.zip | |
shut up gcc;
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 3772916914e..a5b961a5668 100644 --- a/usr.bin/cvs/diff3.c +++ b/usr.bin/cvs/diff3.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diff3.c,v 1.2 2005/10/23 03:47:12 joris Exp $ */ +/* $OpenBSD: diff3.c,v 1.3 2005/10/23 04:03:58 joris Exp $ */ /* * Copyright (C) Caldera International Inc. 2001-2002. @@ -71,7 +71,7 @@ static const char copyright[] = #endif /* not lint */ #ifndef lint -static const char rcsid[] = "$OpenBSD: diff3.c,v 1.2 2005/10/23 03:47:12 joris Exp $"; +static const char rcsid[] = "$OpenBSD: diff3.c,v 1.3 2005/10/23 04:03:58 joris Exp $"; #endif /* not lint */ #include <sys/queue.h> @@ -317,7 +317,7 @@ ed_patch_lines(struct cvs_lines *dlines, struct cvs_lines *plines) dlp = TAILQ_FIRST(&(dlines->l_lines)); lp = TAILQ_FIRST(&(plines->l_lines)); - busy = 0; + busy = end = 0; for (lp = TAILQ_NEXT(lp, l_list); lp != NULL; lp = TAILQ_NEXT(lp, l_list)) { op = lp->l_line[strlen(lp->l_line) - 1]; |