summaryrefslogtreecommitdiff
path: root/usr.bin/cvs
diff options
context:
space:
mode:
authorJoris Vink <joris@cvs.openbsd.org>2005-12-04 17:39:03 +0000
committerJoris Vink <joris@cvs.openbsd.org>2005-12-04 17:39:03 +0000
commitfb5eb85b573f3ded34f51624d2a94e876da52a62 (patch)
treee641fee796991160ad01e0c827515b176cbd0053 /usr.bin/cvs
parentc2c15e14eafea2b809b1b86011124ce5969a5698 (diff)
more code cleanup, remove useless flags and parts of code
that never got used in the first place;
Diffstat (limited to 'usr.bin/cvs')
-rw-r--r--usr.bin/cvs/file.c5
-rw-r--r--usr.bin/cvs/file.h15
2 files changed, 5 insertions, 15 deletions
diff --git a/usr.bin/cvs/file.c b/usr.bin/cvs/file.c
index 593e4c31e05..d699645190e 100644
--- a/usr.bin/cvs/file.c
+++ b/usr.bin/cvs/file.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: file.c,v 1.130 2005/12/03 15:07:21 joris Exp $ */
+/* $OpenBSD: file.c,v 1.131 2005/12/04 17:39:02 joris Exp $ */
/*
* Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
* All rights reserved.
@@ -816,9 +816,6 @@ cvs_load_dirinfo(CVSFILE *cf, int flags)
cf->cf_repo = NULL;
}
- if (flags & CF_MKADMIN)
- cvs_mkadmin(fpath, cf->cf_root->cr_str, NULL, NULL, NULL, 0);
-
return (0);
}
diff --git a/usr.bin/cvs/file.h b/usr.bin/cvs/file.h
index 9847d2e708f..ea6c97998dc 100644
--- a/usr.bin/cvs/file.h
+++ b/usr.bin/cvs/file.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: file.h,v 1.31 2005/12/03 02:19:17 joris Exp $ */
+/* $OpenBSD: file.h,v 1.32 2005/12/04 17:39:02 joris Exp $ */
/*
* Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
* All rights reserved.
@@ -37,20 +37,15 @@
struct cvs_file;
struct cvs_entries;
-
-#define CVS_FILE_MAXDEPTH 32
-
-
#define CF_STAT 0x01 /* obsolete */
#define CF_IGNORE 0x02 /* apply regular ignore rules */
#define CF_RECURSE 0x04 /* recurse on directory operations */
#define CF_SORT 0x08 /* all files are sorted alphabetically */
#define CF_KNOWN 0x10 /* only recurse in directories known to CVS */
#define CF_CREATE 0x20 /* create if file does not exist */
-#define CF_MKADMIN 0x40 /* create admin files if they're missing */
-#define CF_NOSYMS 0x80 /* ignore symbolic links */
-#define CF_NOFILES 0x100 /* don't load any files inside a directory */
-#define CF_REPO 0x200 /* we are loading a repository with ,v files */
+#define CF_NOSYMS 0x40 /* ignore symbolic links */
+#define CF_NOFILES 0x80 /* don't load any files inside a directory */
+#define CF_REPO 0x100 /* we are loading a repository with ,v files */
/*
* The cvs_file structure is used to represent any file or directory within
@@ -71,7 +66,6 @@ struct cvs_entries;
#define CVS_FST_PATCHED 6
#define CVS_FST_LOST 7 /* Needs Checkout */
-
SIMPLEQ_HEAD(cvs_flist, cvs_file);
typedef struct cvs_file {
@@ -123,7 +117,6 @@ typedef struct cvs_file {
#define cf_repo cf_td.cf_dir.cd_repo
#define cf_root cf_td.cf_dir.cd_root
-
#define CVS_DIRF_STATIC 0x01
#define CVS_DIRF_STICKY 0x02
#define CVS_DIRF_BASE 0x04