summaryrefslogtreecommitdiffstats
path: root/usr.bin/make
diff options
context:
space:
mode:
authorharti <harti@FreeBSD.org>2004-11-22 15:45:57 +0000
committerharti <harti@FreeBSD.org>2004-11-22 15:45:57 +0000
commit148edef2ed969703db6fe73781423f99808ab7a8 (patch)
treee04bed41e2327bcd464c23ac71290d614e2d263c /usr.bin/make
parentd1447f497ba44996ddac136fb8440aed27ddd66c (diff)
downloadFreeBSD-src-148edef2ed969703db6fe73781423f99808ab7a8.zip
FreeBSD-src-148edef2ed969703db6fe73781423f99808ab7a8.tar.gz
Get rid of the shell table sentinel. It isn't needed anymore because
JobMatchShell returns NULL when no shell name matches since revision 1.51.
Diffstat (limited to 'usr.bin/make')
-rw-r--r--usr.bin/make/job.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/usr.bin/make/job.c b/usr.bin/make/job.c
index 8515e00..0b86bb0 100644
--- a/usr.bin/make/job.c
+++ b/usr.bin/make/job.c
@@ -205,15 +205,6 @@ static Shell shells[] = {
TRUE, "set -e", "set +e",
"v", "e",
},
- /*
- * UNKNOWN.
- */
-{
- (char *) 0,
- FALSE, (char *) 0, (char *) 0, (char *) 0, 0,
- FALSE, (char *) 0, (char *) 0,
- (char *) 0, (char *) 0,
-}
};
static Shell *commandShell = &shells[DEFSHELL];/* this is the shell to
* which we pass all
@@ -2345,7 +2336,7 @@ JobMatchShell(char *name)
match = NULL;
- for (sh = shells; sh->name != NULL; sh++) {
+ for (sh = shells; sh < shells + sizeof(shells) / sizeof(shells[0]); sh++) {
for (cp1 = eoname - strlen(sh->name), cp2 = sh->name;
*cp1 != '\0' && *cp1 == *cp2;
cp1++, cp2++) {
OpenPOWER on IntegriCloud