summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@cvs.openbsd.org>2010-10-29 17:49:38 +0000
committerNicholas Marriott <nicm@cvs.openbsd.org>2010-10-29 17:49:38 +0000
commit8dd37fe55d76a167f93fd59bfdef1579266a4cdf (patch)
tree2f802f53579b4a7578a94c5027388debc6e465e2 /usr.bin
parent7fc4080c7e50ab5f2862a1a37419d3be6f48fd37 (diff)
Nuke some unused variables and remove an unnecessary call to dirname().
From Michael W Bombardieri via ray@.
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/cvs/diff3.c6
-rw-r--r--usr.bin/cvs/rcsparse.c5
-rw-r--r--usr.bin/cvs/trigger.c4
3 files changed, 6 insertions, 9 deletions
diff --git a/usr.bin/cvs/diff3.c b/usr.bin/cvs/diff3.c
index ec74dcca1f4..4b8563a31ed 100644
--- a/usr.bin/cvs/diff3.c
+++ b/usr.bin/cvs/diff3.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: diff3.c,v 1.53 2010/07/23 21:46:05 ray Exp $ */
+/* $OpenBSD: diff3.c,v 1.54 2010/10/29 17:49:37 nicm Exp $ */
/*
* Copyright (C) Caldera International Inc. 2001-2002.
@@ -160,13 +160,13 @@ cvs_merge_file(struct cvs_file *cf, int verbose)
char *data, *patch;
char *argv[5], r1[CVS_REV_BUFSZ], r2[CVS_REV_BUFSZ];
char *dp13, *dp23, *path1, *path2, *path3;
- BUF *b1, *b2, *b3, *d1, *d2, *diffb;
+ BUF *b1, *d1, *d2, *diffb;
size_t dlen, plen;
struct rcs_line *lp;
struct rcs_lines *dlines, *plines;
overlapcnt = 0;
- b1 = b2 = b3 = d1 = d2 = diffb = NULL;
+ b1 = d1 = d2 = diffb = NULL;
rcsnum_tostr(d3rev1, r1, sizeof(r1));
rcsnum_tostr(d3rev2, r2, sizeof(r2));
diff --git a/usr.bin/cvs/rcsparse.c b/usr.bin/cvs/rcsparse.c
index e894be629f0..23561b3a100 100644
--- a/usr.bin/cvs/rcsparse.c
+++ b/usr.bin/cvs/rcsparse.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rcsparse.c,v 1.3 2010/10/20 19:53:53 tobias Exp $ */
+/* $OpenBSD: rcsparse.c,v 1.4 2010/10/29 17:49:37 nicm Exp $ */
/*
* Copyright (c) 2010 Tobias Stoeckmann <tobias@openbsd.org>
*
@@ -1138,7 +1138,6 @@ end:
static int
rcsparse_deltatext(RCSFILE *rfp)
{
- struct rcs_pdata *pdp;
int ret;
if (rfp->rf_flags & PARSED_DELTATEXTS)
@@ -1147,8 +1146,6 @@ rcsparse_deltatext(RCSFILE *rfp)
if (!(rfp->rf_flags & PARSED_DESC))
if ((ret = rcsparse_desc(rfp)))
return (ret);
-
- pdp = (struct rcs_pdata *)rfp->rf_pdata;
if (rcsparse(rfp, sec_deltatext))
return (-1);
diff --git a/usr.bin/cvs/trigger.c b/usr.bin/cvs/trigger.c
index f2d3f010b73..2978af66467 100644
--- a/usr.bin/cvs/trigger.c
+++ b/usr.bin/cvs/trigger.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trigger.c,v 1.18 2010/07/23 21:46:05 ray Exp $ */
+/* $OpenBSD: trigger.c,v 1.19 2010/10/29 17:49:37 nicm Exp $ */
/*
* Copyright (c) 2008 Tobias Stoeckmann <tobias@openbsd.org>
* Copyright (c) 2008 Jonathan Armani <dbd@asystant.net>
@@ -561,7 +561,7 @@ cvs_trigger_loginfo_header(BUF *buf, char *repo)
buf_puts(buf, "In directory ");
buf_puts(buf, hostname);
buf_puts(buf, ":");
- buf_puts(buf, dirname(pwd));
+ buf_puts(buf, dir);
buf_putc(buf, '/');
buf_puts(buf, repo);
buf_putc(buf, '\n');