diff options
author | imp <imp@FreeBSD.org> | 2014-02-03 16:54:53 +0000 |
---|---|---|
committer | imp <imp@FreeBSD.org> | 2014-02-03 16:54:53 +0000 |
commit | cbd8148f2b5643f763e4df5a7be263540ed3254c (patch) | |
tree | aab66b28c3839a57dc3b9ff7ad36da9b9efcee66 | |
parent | 423a8d8f96b11270a2647bb09fd87edc437c9c01 (diff) | |
download | FreeBSD-src-cbd8148f2b5643f763e4df5a7be263540ed3254c.zip FreeBSD-src-cbd8148f2b5643f763e4df5a7be263540ed3254c.tar.gz |
Move the check for standard keyword + optional inclusion specifier to
its proper location. Otherwise you could have 'file.c standard pci'
without an error. This construct isn't in our tree, and has no well
defined meaning.
-rw-r--r-- | usr.sbin/config/mkmakefile.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.sbin/config/mkmakefile.c b/usr.sbin/config/mkmakefile.c index 364b5af..7d37475 100644 --- a/usr.sbin/config/mkmakefile.c +++ b/usr.sbin/config/mkmakefile.c @@ -513,18 +513,18 @@ nextparam: nowerror = 1; goto nextparam; } + if (std) { + fprintf(stderr, + "standard entry %s has optional inclusion specifier %s!\n", + this, wd); + exit(1); + } nreqs++; STAILQ_FOREACH(dp, &dtab, d_next) if (eq(dp->d_name, wd)) { dp->d_done |= DEVDONE; goto nextparam; } - if (std) { - fprintf(stderr, - "standard entry %s has a device keyword - %s!\n", - this, wd); - exit(1); - } SLIST_FOREACH(op, &opt, op_next) if (op->op_value == 0 && opteq(op->op_name, wd)) goto nextparam; |