summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorJoris Vink <joris@cvs.openbsd.org>2005-10-23 04:03:59 +0000
committerJoris Vink <joris@cvs.openbsd.org>2005-10-23 04:03:59 +0000
commit45538afa139c3dd50b9f6851eb2e28419c04d973 (patch)
treeaf7254ff43a93008b8da663260e5185944d7922b /usr.bin
parent8f7d259c3835f79fa285808099d2260f67be99bb (diff)
shut up gcc;
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/cvs/diff3.c6
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];