summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorJean-Francois Brousseau <jfb@cvs.openbsd.org>2005-05-22 17:48:55 +0000
committerJean-Francois Brousseau <jfb@cvs.openbsd.org>2005-05-22 17:48:55 +0000
commitbebecdae9ea67167ed084e9db334a9d631466924 (patch)
tree7ddaaebb4062c223a98b5c4fa2bac87c38c0d519 /usr.bin
parent4d42806514781c6e1511b2cb298b0c1a235c8168 (diff)
remove ununsed code
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/cvs/diff.c34
1 files changed, 6 insertions, 28 deletions
diff --git a/usr.bin/cvs/diff.c b/usr.bin/cvs/diff.c
index a1b7e76af9f..863ef2c04f9 100644
--- a/usr.bin/cvs/diff.c
+++ b/usr.bin/cvs/diff.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: diff.c,v 1.34 2005/05/20 20:00:53 joris Exp $ */
+/* $OpenBSD: diff.c,v 1.35 2005/05/22 17:48:54 jfb Exp $ */
/*
* Copyright (C) Caldera International Inc. 2001-2002.
* All rights reserved.
@@ -128,7 +128,6 @@
#include <sys/param.h>
#include <sys/stat.h>
-#include <sys/wait.h>
#include <err.h>
#include <errno.h>
@@ -207,18 +206,11 @@ struct diff_arg {
};
-struct excludes {
- char *pattern;
- struct excludes *next;
-};
-
-
-char *splice(char *, char *);
-int cvs_diff_options(char *, int, char **, int *);
-int cvs_diffreg(const char *, const char *);
-int cvs_diff_file(struct cvs_file *, void *);
-int cvs_diff_sendflags(struct cvsroot *);
-int cvs_diff_cleanup(void);
+int cvs_diff_options (char *, int, char **, int *);
+int cvs_diffreg (const char *, const char *);
+int cvs_diff_file (CVSFILE *, void *);
+int cvs_diff_sendflags (struct cvsroot *);
+int cvs_diff_cleanup (void);
static void output(const char *, FILE *, const char *, FILE *);
static void check(FILE *, FILE *);
@@ -771,20 +763,6 @@ files_differ(FILE *f1, FILE *f2)
}
}
-
-char *
-splice(char *dir, char *filename)
-{
- char *tail, *buf;
-
- if ((tail = strrchr(filename, '/')) == NULL)
- tail = filename;
- else
- tail++;
- asprintf(&buf, "%s/%s", dir, tail);
- return (buf);
-}
-
static int
prepare(int i, FILE *fd, off_t filesize)
{