summaryrefslogtreecommitdiffstats
path: root/usr.bin/cvs/diff.c
diff options
context:
space:
mode:
authorjfb <jfb@openbsd.org>2004-08-06 13:08:39 +0000
committerjfb <jfb@openbsd.org>2004-08-06 13:08:39 +0000
commitb33893e87388dc228639dc2f20f3d1368af69aae (patch)
treecb4b1f7908fa83cb2585f75e89837f0ef9310756 /usr.bin/cvs/diff.c
parentHave one global hierarchy of files that are being affected. This will (diff)
downloadwireguard-openbsd-b33893e87388dc228639dc2f20f3d1368af69aae.tar.xz
wireguard-openbsd-b33893e87388dc228639dc2f20f3d1368af69aae.zip
Start using the global files list
Diffstat (limited to 'usr.bin/cvs/diff.c')
-rw-r--r--usr.bin/cvs/diff.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/usr.bin/cvs/diff.c b/usr.bin/cvs/diff.c
index 14e7c879329..61f1bb9eb4d 100644
--- a/usr.bin/cvs/diff.c
+++ b/usr.bin/cvs/diff.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: diff.c,v 1.5 2004/07/30 20:55:35 jfb Exp $ */
+/* $OpenBSD: diff.c,v 1.6 2004/08/06 13:08:39 jfb Exp $ */
/*
* Copyright (C) Caldera International Inc. 2001-2002.
* All rights reserved.
@@ -351,7 +351,6 @@ int
cvs_diff(int argc, char **argv)
{
int ch, recurse, flags;
- struct cvs_file *files;
struct diff_arg darg;
struct cvsroot *root;
@@ -413,16 +412,16 @@ cvs_diff(int argc, char **argv)
argv += optind;
if (argc == 0) {
- files = cvs_file_get(".", flags);
+ cvs_files = cvs_file_get(".", flags);
}
else
- files = cvs_file_getspec(argv, argc, 0);
+ cvs_files = cvs_file_getspec(argv, argc, 0);
- cvs_file_examine(files, cvs_diff_file, &darg);
+ cvs_file_examine(cvs_files, cvs_diff_file, &darg);
- root = files->cf_ddat->cd_root;
+ root = cvs_files->cf_ddat->cd_root;
if (root->cr_method != CVS_METHOD_LOCAL) {
- cvs_senddir(root, files);
+ cvs_senddir(root, cvs_files);
cvs_sendreq(root, CVS_REQ_DIFF, NULL);
}