summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorJoris Vink <joris@cvs.openbsd.org>2008-03-09 01:52:56 +0000
committerJoris Vink <joris@cvs.openbsd.org>2008-03-09 01:52:56 +0000
commit71af4d99e4d432e46531b8ff25f4978ec0fc5e72 (patch)
tree86f583decb7a4c1df75fab6c15344dbb2d0f436c /usr.bin
parent10f9da07beedde7e9fa7a6a1a17f5b6ab4788509 (diff)
unused var
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 36aa0cff974..30871960396 100644
--- a/usr.bin/cvs/diff3.c
+++ b/usr.bin/cvs/diff3.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: diff3.c,v 1.47 2008/03/08 20:26:34 joris Exp $ */
+/* $OpenBSD: diff3.c,v 1.48 2008/03/09 01:52:55 joris 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.47 2008/03/08 20:26:34 joris Exp $";
+ "$OpenBSD: diff3.c,v 1.48 2008/03/09 01:52:55 joris Exp $";
#endif /* not lint */
#include <ctype.h>
@@ -333,7 +333,7 @@ diff3_internal(int argc, char **argv, const char *fmark, const char *rmark)
int
ed_patch_lines(struct cvs_lines *dlines, struct cvs_lines *plines)
{
- char op, *ep, *p;
+ char op, *ep;
struct cvs_line *sort, *lp, *dlp, *ndlp, *insert_after;
int start, end, i, lineno;
u_char tmp;