Module Name: src
Committed By: rillig
Date: Mon Nov 23 23:41:11 UTC 2020
Modified Files:
src/usr.bin/make: compat.c dir.c job.c main.c meta.c parse.c targ.c
util.c var.c
src/usr.bin/make/filemon: filemon_dev.c filemon_ktrace.c
Log Message:
make(1): use comparisons in boolean expressions
The generated code stays exactly the same.
To generate a diff of this commit:
cvs rdiff -u -r1.186 -r1.187 src/usr.bin/make/compat.c
cvs rdiff -u -r1.221 -r1.222 src/usr.bin/make/dir.c
cvs rdiff -u -r1.327 -r1.328 src/usr.bin/make/job.c
cvs rdiff -u -r1.477 -r1.478 src/usr.bin/make/main.c
cvs rdiff -u -r1.146 -r1.147 src/usr.bin/make/meta.c
cvs rdiff -u -r1.450 -r1.451 src/usr.bin/make/parse.c
cvs rdiff -u -r1.140 -r1.141 src/usr.bin/make/targ.c
cvs rdiff -u -r1.69 -r1.70 src/usr.bin/make/util.c
cvs rdiff -u -r1.694 -r1.695 src/usr.bin/make/var.c
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/make/filemon/filemon_dev.c
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/make/filemon/filemon_ktrace.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/compat.c
diff -u src/usr.bin/make/compat.c:1.186 src/usr.bin/make/compat.c:1.187
--- src/usr.bin/make/compat.c:1.186 Mon Nov 23 19:35:10 2020
+++ src/usr.bin/make/compat.c Mon Nov 23 23:41:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: compat.c,v 1.186 2020/11/23 19:35:10 rillig Exp $ */
+/* $NetBSD: compat.c,v 1.187 2020/11/23 23:41:11 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -96,7 +96,7 @@
#include "pathnames.h"
/* "@(#)compat.c 8.2 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: compat.c,v 1.186 2020/11/23 19:35:10 rillig Exp $");
+MAKE_RCSID("$NetBSD: compat.c,v 1.187 2020/11/23 23:41:11 rillig Exp $");
static GNode *curTarg = NULL;
static pid_t compatChild;
@@ -436,7 +436,7 @@ Compat_RunCommand(const char *cmdp, GNod
free(cmdStart);
compatChild = 0;
- if (compatSigno) {
+ if (compatSigno != 0) {
bmake_signal(compatSigno, SIG_DFL);
kill(myPid, compatSigno);
}
Index: src/usr.bin/make/dir.c
diff -u src/usr.bin/make/dir.c:1.221 src/usr.bin/make/dir.c:1.222
--- src/usr.bin/make/dir.c:1.221 Mon Nov 23 23:00:36 2020
+++ src/usr.bin/make/dir.c Mon Nov 23 23:41:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: dir.c,v 1.221 2020/11/23 23:00:36 rillig Exp $ */
+/* $NetBSD: dir.c,v 1.222 2020/11/23 23:41:11 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.221 2020/11/23 23:00:36 rillig Exp $");
+MAKE_RCSID("$NetBSD: dir.c,v 1.222 2020/11/23 23:41:11 rillig Exp $");
#define DIR_DEBUG0(text) DEBUG0(DIR, text)
#define DIR_DEBUG1(fmt, arg1) DEBUG1(DIR, fmt, arg1)
@@ -447,7 +447,7 @@ void
Dir_End(void)
{
#ifdef CLEANUP
- if (cur) {
+ if (cur != NULL) {
cur->refCount--;
Dir_Destroy(cur);
}
@@ -484,9 +484,9 @@ Dir_SetPATH(void)
}
if (!hasLastDot) {
- if (dot)
+ if (dot != NULL)
Var_Append(".PATH", dot->name, VAR_GLOBAL);
- if (cur)
+ if (cur != NULL)
Var_Append(".PATH", cur->name, VAR_GLOBAL);
}
@@ -500,9 +500,9 @@ Dir_SetPATH(void)
}
if (hasLastDot) {
- if (dot)
+ if (dot != NULL)
Var_Append(".PATH", dot->name, VAR_GLOBAL);
- if (cur)
+ if (cur != NULL)
Var_Append(".PATH", cur->name, VAR_GLOBAL);
}
}
@@ -992,7 +992,7 @@ Dir_FindFile(const char *name, SearchPat
* slash in it (the name, I mean)
*/
base = strrchr(name, '/');
- if (base) {
+ if (base != NULL) {
hasSlash = TRUE;
base++;
} else {
@@ -1086,7 +1086,7 @@ Dir_FindFile(const char *name, SearchPat
DIR_DEBUG0(" Trying subdirectories...\n");
if (!hasLastDot) {
- if (dot) {
+ if (dot != NULL) {
checkedDot = TRUE;
if ((file = DirLookupSubdir(dot, name)) != NULL)
return file;
Index: src/usr.bin/make/job.c
diff -u src/usr.bin/make/job.c:1.327 src/usr.bin/make/job.c:1.328
--- src/usr.bin/make/job.c:1.327 Mon Nov 23 20:41:20 2020
+++ src/usr.bin/make/job.c Mon Nov 23 23:41:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: job.c,v 1.327 2020/11/23 20:41:20 rillig Exp $ */
+/* $NetBSD: job.c,v 1.328 2020/11/23 23:41:11 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -143,7 +143,7 @@
#include "trace.h"
/* "@(#)job.c 8.2 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: job.c,v 1.327 2020/11/23 20:41:20 rillig Exp $");
+MAKE_RCSID("$NetBSD: job.c,v 1.328 2020/11/23 23:41:11 rillig Exp $");
/* A shell defines how the commands are run. All commands for a target are
* written into a single file, which is then given to the shell to execute
@@ -1838,7 +1838,7 @@ JobRun(GNode *targ)
(void)Make_Run(lst);
Lst_Destroy(lst, NULL);
JobStart(targ, JOB_SPECIAL);
- while (jobTokensRunning) {
+ while (jobTokensRunning != 0) {
Job_CatchOutput();
}
#else
@@ -2033,15 +2033,15 @@ Shell_Init(void)
free(shellErrFlag);
shellErrFlag = NULL;
}
- if (!shellErrFlag) {
+ if (shellErrFlag == NULL) {
size_t n = strlen(commandShell->exit) + 2;
shellErrFlag = bmake_malloc(n);
- if (shellErrFlag) {
+ if (shellErrFlag != NULL) {
snprintf(shellErrFlag, n, "-%s", commandShell->exit);
}
}
- } else if (shellErrFlag) {
+ } else if (shellErrFlag != NULL) {
free(shellErrFlag);
shellErrFlag = NULL;
}
@@ -2058,7 +2058,7 @@ Shell_GetNewline(void)
void
Job_SetPrefix(void)
{
- if (targPrefix) {
+ if (targPrefix != NULL) {
free(targPrefix);
} else if (!Var_Exists(MAKE_JOB_PREFIX, VAR_GLOBAL)) {
Var_Set(MAKE_JOB_PREFIX, "---", VAR_GLOBAL);
@@ -2330,7 +2330,7 @@ Job_ParseShell(char *line)
}
commandShell = sh;
shellName = newShell.name;
- if (shellPath) {
+ if (shellPath != NULL) {
/* Shell_Init has already been called! Do it again. */
free(UNCONST(shellPath));
shellPath = NULL;
@@ -2451,7 +2451,7 @@ Job_Finish(void)
{
GNode *endNode = Targ_GetEndNode();
if (!Lst_IsEmpty(endNode->commands) || !Lst_IsEmpty(endNode->children)) {
- if (errors) {
+ if (errors != 0) {
Error("Errors reported so .END ignored");
} else {
JobRun(endNode);
@@ -2494,7 +2494,7 @@ Job_AbortAll(void)
aborting = ABORT_ERROR;
- if (jobTokensRunning) {
+ if (jobTokensRunning != 0) {
for (job = job_table; job < job_table_end; job++) {
if (job->status != JOB_ST_RUNNING)
continue;
@@ -2735,7 +2735,7 @@ Job_RunTarget(const char *target, const
if (gn == NULL)
return FALSE;
- if (fname)
+ if (fname != NULL)
Var_Set(ALLSRC, fname, gn);
JobRun(gn);
Index: src/usr.bin/make/main.c
diff -u src/usr.bin/make/main.c:1.477 src/usr.bin/make/main.c:1.478
--- src/usr.bin/make/main.c:1.477 Mon Nov 23 20:52:59 2020
+++ src/usr.bin/make/main.c Mon Nov 23 23:41:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.477 2020/11/23 20:52:59 rillig Exp $ */
+/* $NetBSD: main.c,v 1.478 2020/11/23 23:41:11 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.477 2020/11/23 20:52:59 rillig Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.478 2020/11/23 23:41:11 rillig Exp $");
#if defined(MAKE_NATIVE) && !defined(lint)
__COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 "
"The Regents of the University of California. "
@@ -2214,7 +2214,7 @@ mkTempFile(const char *pattern, char **o
if ((fd = mkstemp(tfile)) < 0)
Punt("Could not create temporary file %s: %s", tfile,
strerror(errno));
- if (out_fname) {
+ if (out_fname != NULL) {
*out_fname = bmake_strdup(tfile);
} else {
unlink(
Index: src/usr.bin/make/meta.c
diff -u src/usr.bin/make/meta.c:1.146 src/usr.bin/make/meta.c:1.147
--- src/usr.bin/make/meta.c:1.146 Mon Nov 23 20:52:59 2020
+++ src/usr.bin/make/meta.c Mon Nov 23 23:41:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: meta.c,v 1.146 2020/11/23 20:52:59 rillig Exp $ */
+/* $NetBSD: meta.c,v 1.147 2020/11/23 23:41:11 rillig Exp $ */
/*
* Implement 'meta' mode.
@@ -218,7 +218,7 @@ eat_dots(char *buf, size_t bufsz, int do
do {
cp = strstr(buf, eat);
- if (cp) {
+ if (cp != NULL) {
cp2 = cp + eatlen;
if (dots == 2 && cp > buf) {
do {
@@ -231,7 +231,7 @@ eat_dots(char *buf, size_t bufsz, int do
return; /* can't happen? */
}
}
- } while (cp);
+ } while (cp != NULL);
}
static char *
@@ -408,7 +408,7 @@ printCMDs(GNode *gn, meta_file_t *mf)
*/
static Boolean
meta_needed(GNode *gn, const char *dname, const char *tname,
- char *objdir, int verbose)
+ char *objdir, Boolean verbose)
{
struct cached_stat cst;
@@ -588,7 +588,7 @@ meta_init(void)
void
meta_mode_init(const char *make_mode)
{
- static int once = 0;
+ static Boolean once = FALSE;
char *cp;
void *freeIt;
@@ -596,7 +596,7 @@ meta_mode_init(const char *make_mode)
useFilemon = TRUE;
writeMeta = TRUE;
- if (make_mode) {
+ if (make_mode != NULL) {
if (strstr(make_mode, "env"))
metaEnv = TRUE;
if (strstr(make_mode, "verb"))
@@ -624,7 +624,7 @@ meta_mode_init(const char *make_mode)
}
if (once)
return;
- once = 1;
+ once = TRUE;
memset(&Mybm, 0, sizeof Mybm);
/*
* We consider ourselves master of all within ${.MAKE.META.BAILIWICK}
@@ -790,7 +790,7 @@ meta_job_error(Job *job, GNode *gn, int
(flags & JOB_IGNERR) ?
"(ignored)" : "");
}
- if (gn) {
+ if (gn != NULL) {
Var_Set(".ERROR_TARGET", GNode_Path(gn), VAR_GLOBAL);
}
getcwd(cwd, sizeof cwd);
@@ -1229,12 +1229,12 @@ meta_oodate(GNode *gn, Boolean oodate)
snprintf(ldir_vname, sizeof ldir_vname, LDIR_VNAME_FMT, pid);
lastpid = pid;
ldir = Var_Value(ldir_vname, VAR_GLOBAL, &tp);
- if (ldir) {
+ if (ldir != NULL) {
strlcpy(latestdir, ldir, sizeof latestdir);
bmake_free(tp);
}
ldir = Var_Value(lcwd_vname, VAR_GLOBAL, &tp);
- if (ldir) {
+ if (ldir != NULL) {
strlcpy(lcwd, ldir, sizeof lcwd);
bmake_free(tp);
}
@@ -1414,7 +1414,7 @@ meta_oodate(GNode *gn, Boolean oodate)
char *sdirs[4];
char **sdp;
int sdx = 0;
- int found = 0;
+ Boolean found = FALSE;
if (*p == '/') {
sdirs[sdx++] = p; /* done */
@@ -1445,7 +1445,7 @@ meta_oodate(GNode *gn, Boolean oodate)
fname, lineno, *sdp);
#endif
if (cached_stat(*sdp, &cst) == 0) {
- found = 1;
+ found = TRUE;
p = *sdp;
}
}
@@ -1531,7 +1531,7 @@ meta_oodate(GNode *gn, Boolean oodate)
break;
}
cp = strchr(++cp, '\n');
- } while (cp);
+ } while (cp != NULL);
if (buf[x - 1] == '\n')
buf[x - 1] = '\0';
}
Index: src/usr.bin/make/parse.c
diff -u src/usr.bin/make/parse.c:1.450 src/usr.bin/make/parse.c:1.451
--- src/usr.bin/make/parse.c:1.450 Mon Nov 23 20:52:59 2020
+++ src/usr.bin/make/parse.c Mon Nov 23 23:41:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.450 2020/11/23 20:52:59 rillig Exp $ */
+/* $NetBSD: parse.c,v 1.451 2020/11/23 23:41:11 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.450 2020/11/23 20:52:59 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.451 2020/11/23 23:41:11 rillig Exp $");
/* types and constants */
@@ -1705,7 +1705,7 @@ ParseDoDependency(char *line)
specType == SP_NULL || specType == SP_OBJDIR)
{
ParseDoDependencySourcesSpecial(line, cp, specType, paths);
- if (paths) {
+ if (paths != NULL) {
Lst_Free(paths);
paths = NULL;
}
@@ -1930,7 +1930,7 @@ VarAssign_EvalShell(const char *name, co
Var_Set(name, cmdOut, ctxt);
*out_avalue = *out_avalue_freeIt = cmdOut;
- if (errfmt)
+ if (errfmt != NULL)
Parse_Error(PARSE_WARNING, errfmt, cmd);
free(cmd_freeIt);
Index: src/usr.bin/make/targ.c
diff -u src/usr.bin/make/targ.c:1.140 src/usr.bin/make/targ.c:1.141
--- src/usr.bin/make/targ.c:1.140 Sun Nov 22 20:01:46 2020
+++ src/usr.bin/make/targ.c Mon Nov 23 23:41:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: targ.c,v 1.140 2020/11/22 20:01:46 rillig Exp $ */
+/* $NetBSD: targ.c,v 1.141 2020/11/23 23:41:11 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -119,7 +119,7 @@
#include "dir.h"
/* "@(#)targ.c 8.2 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: targ.c,v 1.140 2020/11/22 20:01:46 rillig Exp $");
+MAKE_RCSID("$NetBSD: targ.c,v 1.141 2020/11/23 23:41:11 rillig Exp $");
/*
* All target nodes that appeared on the left-hand side of one of the
@@ -416,7 +416,7 @@ Targ_PrintType(int type)
type &= ~OP_OPMASK;
- while (type) {
+ while (type != 0) {
tbit = 1 << (ffs(type) - 1);
type &= ~tbit;
Index: src/usr.bin/make/util.c
diff -u src/usr.bin/make/util.c:1.69 src/usr.bin/make/util.c:1.70
--- src/usr.bin/make/util.c:1.69 Mon Nov 23 20:41:20 2020
+++ src/usr.bin/make/util.c Mon Nov 23 23:41:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: util.c,v 1.69 2020/11/23 20:41:20 rillig Exp $ */
+/* $NetBSD: util.c,v 1.70 2020/11/23 23:41:11 rillig Exp $ */
/*
* Missing stuff from OS's
@@ -15,7 +15,7 @@
#include "make.h"
-MAKE_RCSID("$NetBSD: util.c,v 1.69 2020/11/23 20:41:20 rillig Exp $");
+MAKE_RCSID("$NetBSD: util.c,v 1.70 2020/11/23 23:41:11 rillig Exp $");
#if !defined(MAKE_NATIVE) && !defined(HAVE_STRERROR)
extern int errno, sys_nerr;
@@ -162,7 +162,7 @@ strrcpy(char *ptr, char *str)
{
int len = strlen(str);
- while (len)
+ while (len != 0)
*--ptr = str[--len];
return ptr;
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.694 src/usr.bin/make/var.c:1.695
--- src/usr.bin/make/var.c:1.694 Mon Nov 23 20:52:59 2020
+++ src/usr.bin/make/var.c Mon Nov 23 23:41:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.694 2020/11/23 20:52:59 rillig Exp $ */
+/* $NetBSD: var.c,v 1.695 2020/11/23 23:41:11 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.694 2020/11/23 20:52:59 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.695 2020/11/23 23:41:11 rillig Exp $");
#define VAR_DEBUG1(fmt, arg1) DEBUG1(VAR, fmt, arg1)
#define VAR_DEBUG2(fmt, arg1, arg2) DEBUG2(VAR, fmt, arg1, arg2)
@@ -695,7 +695,7 @@ Var_UnExport(const char *str)
/* we have been here before! */
newenv = bmake_realloc(environ, 2 * sizeof(char *));
} else {
- if (savedEnv) {
+ if (savedEnv != NULL) {
free(savedEnv);
savedEnv = NULL;
}
@@ -2558,7 +2558,7 @@ ApplyModifier_Regex(const char **pp, App
error = regcomp(&args.re, re, REG_EXTENDED);
free(re);
- if (error) {
+ if (error != 0) {
VarREError(error, &args.re, "Regex compilation error");
free(args.replace);
return AMR_CLEANUP;
@@ -3007,7 +3007,7 @@ ok:
case '!': {
const char *errfmt;
char *cmd_output = Cmd_Exec(val, &errfmt);
- if (errfmt)
+ if (errfmt != NULL)
Error(errfmt, val);
else
Var_Set(st->var->name, cmd_output, v_ctxt);
@@ -3145,7 +3145,7 @@ ApplyModifier_SunShell(const char **pp,
if (st->eflags & VARE_WANTRES) {
const char *errfmt;
st->newVal = Cmd_Exec(st->val, &errfmt);
- if (errfmt)
+ if (errfmt != NULL)
Error(errfmt, st->val);
} else
st->newVal = bmake_strdup("");
Index: src/usr.bin/make/filemon/filemon_dev.c
diff -u src/usr.bin/make/filemon/filemon_dev.c:1.4 src/usr.bin/make/filemon/filemon_dev.c:1.5
--- src/usr.bin/make/filemon/filemon_dev.c:1.4 Thu Nov 5 17:27:16 2020
+++ src/usr.bin/make/filemon/filemon_dev.c Mon Nov 23 23:41:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: filemon_dev.c,v 1.4 2020/11/05 17:27:16 rillig Exp $ */
+/* $NetBSD: filemon_dev.c,v 1.5 2020/11/23 23:41:11 rillig Exp $ */
/*-
* Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -127,7 +127,7 @@ filemon_close(struct filemon *F)
free(F);
/* Set errno and return -1 if anything went wrong. */
- if (error) {
+ if (error != 0) {
errno = error;
return -1;
}
Index: src/usr.bin/make/filemon/filemon_ktrace.c
diff -u src/usr.bin/make/filemon/filemon_ktrace.c:1.5 src/usr.bin/make/filemon/filemon_ktrace.c:1.6
--- src/usr.bin/make/filemon/filemon_ktrace.c:1.5 Mon Nov 23 20:41:20 2020
+++ src/usr.bin/make/filemon/filemon_ktrace.c Mon Nov 23 23:41:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: filemon_ktrace.c,v 1.5 2020/11/23 20:41:20 rillig Exp $ */
+/* $NetBSD: filemon_ktrace.c,v 1.6 2020/11/23 23:41:11 rillig Exp $ */
/*-
* Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -262,7 +262,7 @@ filemon_closefd(struct filemon *F)
F->out = NULL;
/* Set errno and return -1 if anything went wrong. */
- if (error) {
+ if (error != 0) {
errno = error;
return -1;
}
@@ -373,7 +373,7 @@ filemon_close(struct filemon *F)
free(F);
/* Set errno and return -1 if anything went wrong. */
- if (error) {
+ if (error != 0) {
errno = error;
return -1;
}
