Module Name: src
Committed By: rillig
Date: Mon Nov 23 20:52:59 UTC 2020
Modified Files:
src/usr.bin/make: cond.c dir.c main.c meta.c parse.c var.c
Log Message:
make(1): use properly typed comparisons in boolean contexts
To generate a diff of this commit:
cvs rdiff -u -r1.216 -r1.217 src/usr.bin/make/cond.c
cvs rdiff -u -r1.213 -r1.214 src/usr.bin/make/dir.c
cvs rdiff -u -r1.476 -r1.477 src/usr.bin/make/main.c
cvs rdiff -u -r1.145 -r1.146 src/usr.bin/make/meta.c
cvs rdiff -u -r1.449 -r1.450 src/usr.bin/make/parse.c
cvs rdiff -u -r1.693 -r1.694 src/usr.bin/make/var.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/make/cond.c
diff -u src/usr.bin/make/cond.c:1.216 src/usr.bin/make/cond.c:1.217
--- src/usr.bin/make/cond.c:1.216 Mon Nov 23 20:41:20 2020
+++ src/usr.bin/make/cond.c Mon Nov 23 20:52:59 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cond.c,v 1.216 2020/11/23 20:41:20 rillig Exp $ */
+/* $NetBSD: cond.c,v 1.217 2020/11/23 20:52:59 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -94,7 +94,7 @@
#include "dir.h"
/* "@(#)cond.c 8.2 (Berkeley) 1/2/94" */
-MAKE_RCSID("$NetBSD: cond.c,v 1.216 2020/11/23 20:41:20 rillig Exp $");
+MAKE_RCSID("$NetBSD: cond.c,v 1.217 2020/11/23 20:52:59 rillig Exp $");
/*
* The parsing of conditional expressions is based on this grammar:
@@ -486,7 +486,7 @@ CondParser_String(CondParser *par, Boole
goto cleanup;
Buf_AddStr(&buf, str);
- if (*out_freeIt) {
+ if (*out_freeIt != NULL) {
free(*out_freeIt);
*out_freeIt = NULL;
}
Index: src/usr.bin/make/dir.c
diff -u src/usr.bin/make/dir.c:1.213 src/usr.bin/make/dir.c:1.214
--- src/usr.bin/make/dir.c:1.213 Mon Nov 23 20:41:20 2020
+++ src/usr.bin/make/dir.c Mon Nov 23 20:52:59 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: dir.c,v 1.213 2020/11/23 20:41:20 rillig Exp $ */
+/* $NetBSD: dir.c,v 1.214 2020/11/23 20:52:59 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -134,7 +134,7 @@
#include "job.h"
/* "@(#)dir.c 8.2 (Berkeley) 1/2/94" */
-MAKE_RCSID("$NetBSD: dir.c,v 1.213 2020/11/23 20:41:20 rillig Exp $");
+MAKE_RCSID("$NetBSD: dir.c,v 1.214 2020/11/23 20:52:59 rillig Exp $");
#define DIR_DEBUG0(text) DEBUG0(DIR, text)
#define DIR_DEBUG1(fmt, arg1) DEBUG1(DIR, fmt, arg1)
@@ -770,16 +770,16 @@ Dir_Expand(const char *word, SearchPath
DIR_DEBUG1("Expanding \"%s\"... ", word);
cp = strchr(word, '{');
- if (cp) {
+ if (cp != NULL) {
DirExpandCurly(word, cp, path, expansions);
} else {
cp = strchr(word, '/');
- if (cp) {
+ if (cp != NULL) {
/*
* The thing has a directory component -- find the first wildcard
* in the string.
*/
- for (cp = word; *cp; cp++) {
+ for (cp = word; *cp != '\0'; cp++) {
if (*cp == '?' || *cp == '[' || *cp == '*') {
break;
}
Index: src/usr.bin/make/main.c
diff -u src/usr.bin/make/main.c:1.476 src/usr.bin/make/main.c:1.477
--- src/usr.bin/make/main.c:1.476 Mon Nov 16 22:08:20 2020
+++ src/usr.bin/make/main.c Mon Nov 23 20:52:59 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.476 2020/11/16 22:08:20 rillig Exp $ */
+/* $NetBSD: main.c,v 1.477 2020/11/23 20:52:59 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -109,7 +109,7 @@
#include "trace.h"
/* "@(#)main.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: main.c,v 1.476 2020/11/16 22:08:20 rillig Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.477 2020/11/23 20:52:59 rillig Exp $");
#if defined(MAKE_NATIVE) && !defined(lint)
__COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 "
"The Regents of the University of California. "
@@ -167,12 +167,12 @@ explode(const char *flags)
if (!ch_isalpha(*f))
break;
- if (*f)
+ if (*f != '\0')
return bmake_strdup(flags);
len = strlen(flags);
st = nf = bmake_malloc(len * 3 + 1);
- while (*flags) {
+ while (*flags != '\0') {
*nf++ = '-';
*nf++ = *flags++;
*nf++ = ' ';
Index: src/usr.bin/make/meta.c
diff -u src/usr.bin/make/meta.c:1.145 src/usr.bin/make/meta.c:1.146
--- src/usr.bin/make/meta.c:1.145 Mon Nov 23 20:41:20 2020
+++ src/usr.bin/make/meta.c Mon Nov 23 20:52:59 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: meta.c,v 1.145 2020/11/23 20:41:20 rillig Exp $ */
+/* $NetBSD: meta.c,v 1.146 2020/11/23 20:52:59 rillig Exp $ */
/*
* Implement 'meta' mode.
@@ -491,7 +491,7 @@ meta_create(BuildMon *pbm, GNode *gn)
/* Describe the target we are building */
(void)Var_Subst("${" MAKE_META_PREFIX "}", gn, VARE_WANTRES, &mp);
/* TODO: handle errors */
- if (*mp)
+ if (mp[0] != '\0')
fprintf(stdout, "%s\n", mp);
free(mp);
}
@@ -995,7 +995,7 @@ meta_ignore(GNode *gn, const char *p)
expr = "${" MAKE_META_IGNORE_PATTERNS ":@m@${.p.:M$m}@}";
(void)Var_Subst(expr, gn, VARE_WANTRES, &pm);
/* TODO: handle errors */
- if (*pm) {
+ if (pm[0] != '\0') {
#ifdef DEBUG_META_MODE
DEBUG1(META, "meta_oodate: ignoring pattern: %s\n", p);
#endif
Index: src/usr.bin/make/parse.c
diff -u src/usr.bin/make/parse.c:1.449 src/usr.bin/make/parse.c:1.450
--- src/usr.bin/make/parse.c:1.449 Mon Nov 23 20:41:20 2020
+++ src/usr.bin/make/parse.c Mon Nov 23 20:52:59 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.449 2020/11/23 20:41:20 rillig Exp $ */
+/* $NetBSD: parse.c,v 1.450 2020/11/23 20:52:59 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -117,7 +117,7 @@
#include "pathnames.h"
/* "@(#)parse.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: parse.c,v 1.449 2020/11/23 20:41:20 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.450 2020/11/23 20:52:59 rillig Exp $");
/* types and constants */
@@ -1516,8 +1516,8 @@ ParseDoDependencySourcesSpecial(char *st
{
char savec;
- while (*start) {
- while (*end && !ch_isspace(*end))
+ while (*start != '\0') {
+ while (*end != '\0' && !ch_isspace(*end))
end++;
savec = *end;
*end = '\0';
@@ -1540,7 +1540,7 @@ ParseDoDependencySourcesMundane(char *st
* specifications (i.e. things with left parentheses in them)
* and handle them accordingly.
*/
- for (; *end && !ch_isspace(*end); end++) {
+ for (; *end != '\0' && !ch_isspace(*end); end++) {
if (*end == '(' && end > start && end[-1] != '$') {
/*
* Only stop for a left parenthesis if it isn't at the
@@ -1567,7 +1567,7 @@ ParseDoDependencySourcesMundane(char *st
Lst_Free(sources);
end = start;
} else {
- if (*end) {
+ if (*end != '\0') {
*end = '\0';
end++;
}
@@ -2480,7 +2480,7 @@ ParseTraditionalInclude(char *line)
for (file = all_files; !done; file = cp + 1) {
/* Skip to end of line or next whitespace */
- for (cp = file; *cp && !ch_isspace(*cp); cp++)
+ for (cp = file; *cp != '\0' && !ch_isspace(*cp); cp++)
continue;
if (*cp != '\0')
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.693 src/usr.bin/make/var.c:1.694
--- src/usr.bin/make/var.c:1.693 Sat Nov 21 18:41:57 2020
+++ src/usr.bin/make/var.c Mon Nov 23 20:52:59 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.693 2020/11/21 18:41:57 rillig Exp $ */
+/* $NetBSD: var.c,v 1.694 2020/11/23 20:52:59 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -130,7 +130,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.693 2020/11/21 18:41:57 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.694 2020/11/23 20:52:59 rillig Exp $");
#define VAR_DEBUG1(fmt, arg1) DEBUG1(VAR, fmt, arg1)
#define VAR_DEBUG2(fmt, arg1, arg2) DEBUG2(VAR, fmt, arg1, arg2)
@@ -605,7 +605,7 @@ Var_ExportVars(void)
(void)Var_Subst("${" MAKE_EXPORTED ":O:u}", VAR_GLOBAL, VARE_WANTRES, &val);
/* TODO: handle errors */
- if (*val) {
+ if (val[0] != '\0') {
Words words = Str_Words(val, FALSE);
size_t i;
@@ -1420,12 +1420,11 @@ tryagain:
SepBuf_AddBytes(buf, wp, 1);
wp++;
}
- if (*wp)
+ if (*wp != '\0')
goto tryagain;
}
- if (*wp) {
+ if (*wp != '\0')
SepBuf_AddStr(buf, wp);
- }
break;
default:
VarREError(xrv, &args->re, "Unexpected regex error");
