From owner-svn-src-all@FreeBSD.ORG Mon Feb 3 16:46:02 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 125478EA; Mon, 3 Feb 2014 16:46:02 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D93821A8A; Mon, 3 Feb 2014 16:46:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s13Gk12g064163; Mon, 3 Feb 2014 16:46:01 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s13Gk1mp064162; Mon, 3 Feb 2014 16:46:01 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201402031646.s13Gk1mp064162@svn.freebsd.org> From: Warner Losh Date: Mon, 3 Feb 2014 16:46:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r261436 - head/usr.sbin/config X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Feb 2014 16:46:02 -0000 Author: imp Date: Mon Feb 3 16:46:01 2014 New Revision: 261436 URL: http://svnweb.freebsd.org/changeset/base/261436 Log: In the 17 years since r30796, the mandatory keyword has never been used in any files as far as I can tell, and is currently unused. Retire it. Modified: head/usr.sbin/config/mkmakefile.c Modified: head/usr.sbin/config/mkmakefile.c ============================================================================== --- head/usr.sbin/config/mkmakefile.c Mon Feb 3 15:10:44 2014 (r261435) +++ head/usr.sbin/config/mkmakefile.c Mon Feb 3 16:46:01 2014 (r261436) @@ -299,7 +299,7 @@ read_file(char *fname) char *wd, *this, *compilewith, *depends, *clean, *warning; const char *objprefix; int compile, match, nreqs, std, filetype, - imp_rule, no_obj, before_depend, mandatory, nowerror; + imp_rule, no_obj, before_depend, nowerror; fp = fopen(fname, "r"); if (fp == 0) @@ -307,7 +307,7 @@ read_file(char *fname) next: /* * include "filename" - * filename [ standard | mandatory | optional ] + * filename [ standard | optional ] * [ dev* [ | dev* ... ] | profiling-routine ] [ no-obj ] * [ compile-with "compile rule" [no-implicit-rule] ] * [ dependency "dependency-list"] [ before-depend ] @@ -358,7 +358,7 @@ next: depends = 0; clean = 0; warning = 0; - std = mandatory = 0; + std = 0; imp_rule = 0; no_obj = 0; before_depend = 0; @@ -367,16 +367,9 @@ next: objprefix = ""; if (eq(wd, "standard")) { std = 1; - /* - * If an entry is marked "mandatory", config will abort if it's - * not called by a configuration line in the config file. Apart - * from this, the device is handled like one marked "optional". - */ - } else if (eq(wd, "mandatory")) { - mandatory = 1; } else if (!eq(wd, "optional")) { fprintf(stderr, - "%s: \"%s\" %s must be optional, mandatory or standard\n", + "%s: \"%s\" %s must be optional or standard\n", fname, wd, this); exit(1); } @@ -526,11 +519,6 @@ nextparam: dp->d_done |= DEVDONE; goto nextparam; } - if (mandatory) { - fprintf(stderr, "%s: mandatory device \"%s\" not found\n", - fname, wd); - exit(1); - } if (std) { fprintf(stderr, "standard entry %s has a device keyword - %s!\n",