diff options
Diffstat (limited to 'usr.bin/make')
| -rw-r--r-- | usr.bin/make/arch.c | 6 | ||||
| -rw-r--r-- | usr.bin/make/cond.c | 4 | ||||
| -rw-r--r-- | usr.bin/make/for.c | 8 | ||||
| -rw-r--r-- | usr.bin/make/parse.c | 16 |
4 files changed, 17 insertions, 17 deletions
diff --git a/usr.bin/make/arch.c b/usr.bin/make/arch.c index 01bd80600d4..1975d1a4583 100644 --- a/usr.bin/make/arch.c +++ b/usr.bin/make/arch.c @@ -1,5 +1,5 @@ /* $OpenPackages$ */ -/* $OpenBSD: arch.c,v 1.55 2006/01/20 23:10:19 espie Exp $ */ +/* $OpenBSD: arch.c,v 1.56 2007/03/20 03:50:39 tedu Exp $ */ /* $NetBSD: arch.c,v 1.17 1996/11/06 17:58:59 christos Exp $ */ /* @@ -261,7 +261,7 @@ Arch_ParseArchive(char **linePtr, /* Pointer to start of specification */ * a close paren). */ bool doSubst = false; /* true if need to substitute in memberName */ - while (*cp != '\0' && *cp != ')' && isspace(*cp)) + while (isspace(*cp)) cp++; memberName = cp; while (*cp != '\0' && *cp != ')' && !isspace(*cp)) { @@ -383,7 +383,7 @@ Arch_ParseArchive(char **linePtr, /* Pointer to start of specification */ * entrance to the loop, cp is guaranteed to point at a ')') */ do { cp++; - } while (*cp != '\0' && isspace(*cp)); + } while (isspace(*cp)); *linePtr = cp; return true; diff --git a/usr.bin/make/cond.c b/usr.bin/make/cond.c index 9eafb5c5d87..3b85ca213f5 100644 --- a/usr.bin/make/cond.c +++ b/usr.bin/make/cond.c @@ -1,5 +1,5 @@ /* $OpenPackages$ */ -/* $OpenBSD: cond.c,v 1.32 2007/01/04 18:01:32 espie Exp $ */ +/* $OpenBSD: cond.c,v 1.33 2007/03/20 03:50:39 tedu Exp $ */ /* $NetBSD: cond.c,v 1.7 1996/11/06 17:59:02 christos Exp $ */ /* @@ -644,7 +644,7 @@ CondHandleDefault(bool doEval) /* A variable is empty when it just contains * spaces... 4/15/92, christos */ char *p; - for (p = val; *p && isspace(*p); p++) + for (p = val; isspace(*p); p++) continue; t = *p == '\0' ? True : False; } diff --git a/usr.bin/make/for.c b/usr.bin/make/for.c index 1447079c78c..0565d01fae0 100644 --- a/usr.bin/make/for.c +++ b/usr.bin/make/for.c @@ -1,5 +1,5 @@ /* $OpenPackages$ */ -/* $OpenBSD: for.c,v 1.30 2004/04/07 13:11:36 espie Exp $ */ +/* $OpenBSD: for.c,v 1.31 2007/03/20 03:50:39 tedu Exp $ */ /* $NetBSD: for.c,v 1.4 1996/11/06 17:59:05 christos Exp $ */ /* @@ -139,7 +139,7 @@ For_Eval(const char *line) For *arg; unsigned long n; - while (*ptr && isspace(*ptr)) + while (isspace(*ptr)) ptr++; /* Parse loop. */ @@ -157,7 +157,7 @@ For_Eval(const char *line) return 0; } endVar = ptr++; - while (*ptr && isspace(*ptr)) + while (isspace(*ptr)) ptr++; /* End of variable list ? */ if (endVar - wrd == 2 && wrd[0] == 'i' && wrd[1] == 'n') @@ -204,7 +204,7 @@ For_Accumulate(For *arg, const char *line) if (*ptr == '.') { - for (ptr++; *ptr && isspace(*ptr); ptr++) + for (ptr++; isspace(*ptr); ptr++) continue; if (strncmp(ptr, "endfor", 6) == 0 && diff --git a/usr.bin/make/parse.c b/usr.bin/make/parse.c index 5d6aacb9dd2..8f2a5bfdaa2 100644 --- a/usr.bin/make/parse.c +++ b/usr.bin/make/parse.c @@ -1,5 +1,5 @@ /* $OpenPackages$ */ -/* $OpenBSD: parse.c,v 1.70 2007/01/18 17:49:51 espie Exp $ */ +/* $OpenBSD: parse.c,v 1.71 2007/03/20 03:50:39 tedu Exp $ */ /* $NetBSD: parse.c,v 1.29 1997/03/10 21:20:04 christos Exp $ */ /* @@ -838,7 +838,7 @@ ParseDoDependency(char *line) /* the line to parse */ Parse_Error(PARSE_WARNING, "Extra target ignored"); } } else { - while (*cp && isspace(*cp)) { + while (isspace(*cp)) { cp++; } } @@ -885,7 +885,7 @@ ParseDoDependency(char *line) /* the line to parse */ /* * Get to the first source */ - while (*cp && isspace(*cp)) { + while (isspace(*cp)) { cp++; } line = cp; @@ -997,7 +997,7 @@ ParseDoDependency(char *line) /* the line to parse */ if (savec != '\0') { cp++; } - while (*cp && isspace(*cp)) { + while (isspace(*cp)) { cp++; } line = cp; @@ -1047,7 +1047,7 @@ ParseDoDependency(char *line) /* the line to parse */ ParseDoSrc(tOp, line); } - while (*cp && isspace(*cp)) { + while (isspace(*cp)) { cp++; } line = cp; @@ -1378,7 +1378,7 @@ ParseIsCond(Buffer linebuf, Buffer copy, char *line) char *stripped; - while (*line != '\0' && isspace(*line)) + while (isspace(*line)) line++; /* The line might be a conditional. Ask the conditional module @@ -1389,7 +1389,7 @@ ParseIsCond(Buffer linebuf, Buffer copy, char *line) do { line = Parse_ReadNextConditionalLine(linebuf); if (line != NULL) { - while (*line != '\0' && isspace(*line)) + while (isspace(*line)) line++; stripped = strip_comments(copy, line); } @@ -1425,7 +1425,7 @@ ParseIsCond(Buffer linebuf, Buffer copy, char *line) char *cp; line+=5; - while (*line != '\0' && isspace(*line)) + while (isspace(*line)) line++; for (cp = line; !isspace(*cp) && *cp != '\0';) cp++; |