Module Name: src
Committed By: uebayasi
Date: Thu Oct 9 19:27:05 UTC 2014
Modified Files:
src/usr.bin/config: defs.h files.c
Log Message:
FIT_FORCESELECT is never set anywhere.
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/usr.bin/config/defs.h
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/config/files.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/config/defs.h
diff -u src/usr.bin/config/defs.h:1.52 src/usr.bin/config/defs.h:1.53
--- src/usr.bin/config/defs.h:1.52 Thu Oct 9 19:24:36 2014
+++ src/usr.bin/config/defs.h Thu Oct 9 19:27:04 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.52 2014/10/09 19:24:36 uebayasi Exp $ */
+/* $NetBSD: defs.h,v 1.53 2014/10/09 19:27:04 uebayasi Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -324,7 +324,6 @@ struct filetype
TAILQ_ENTRY(files) fit_anext; /* next file in attr */
};
/* Anything less than 0x10 is sub-type specific */
-#define FIT_FORCESELECT 0x20 /* Always include this file */
/*
* Files. Each file is either standard (always included) or optional,
Index: src/usr.bin/config/files.c
diff -u src/usr.bin/config/files.c:1.15 src/usr.bin/config/files.c:1.16
--- src/usr.bin/config/files.c:1.15 Thu Oct 9 15:25:26 2014
+++ src/usr.bin/config/files.c Thu Oct 9 19:27:04 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: files.c,v 1.15 2014/10/09 15:25:26 uebayasi Exp $ */
+/* $NetBSD: files.c,v 1.16 2014/10/09 19:27:04 uebayasi Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -270,12 +270,7 @@ fixfiles(void)
if (fi->fi_flags & FI_HIDDEN)
continue;
- /* Optional: see if it is to be included. */
- if (fi->fi_flags & FIT_FORCESELECT)
- {
- /* include it */ ;
- }
- else if (fi->fi_optx != NULL) {
+ if (fi->fi_optx != NULL) {
if (fi->fi_optx->cx_type == CX_ATOM) {
addfiletoattr(fi->fi_optx->cx_u.atom, fi);
}
