Module Name: src
Committed By: rillig
Date: Fri Jul 3 08:02:56 UTC 2020
Modified Files:
src/usr.bin/make: arch.c buf.c compat.c cond.c dir.c hash.c job.c
main.c make.c make_malloc.c meta.c parse.c suff.c targ.c util.c
var.c
Log Message:
make(1): remove redundant parentheses around return values
To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 src/usr.bin/make/arch.c
cvs rdiff -u -r1.25 -r1.26 src/usr.bin/make/buf.c
cvs rdiff -u -r1.111 -r1.112 src/usr.bin/make/compat.c
cvs rdiff -u -r1.76 -r1.77 src/usr.bin/make/cond.c
cvs rdiff -u -r1.74 -r1.75 src/usr.bin/make/dir.c
cvs rdiff -u -r1.20 -r1.21 src/usr.bin/make/hash.c
cvs rdiff -u -r1.199 -r1.200 src/usr.bin/make/job.c
cvs rdiff -u -r1.277 -r1.278 src/usr.bin/make/main.c
cvs rdiff -u -r1.97 -r1.98 src/usr.bin/make/make.c
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/make/make_malloc.c
cvs rdiff -u -r1.83 -r1.84 src/usr.bin/make/meta.c
cvs rdiff -u -r1.234 -r1.235 src/usr.bin/make/parse.c
cvs rdiff -u -r1.87 -r1.88 src/usr.bin/make/suff.c
cvs rdiff -u -r1.62 -r1.63 src/usr.bin/make/targ.c
cvs rdiff -u -r1.55 -r1.56 src/usr.bin/make/util.c
cvs rdiff -u -r1.233 -r1.234 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/arch.c
diff -u src/usr.bin/make/arch.c:1.72 src/usr.bin/make/arch.c:1.73
--- src/usr.bin/make/arch.c:1.72 Thu Jul 2 15:47:38 2020
+++ src/usr.bin/make/arch.c Fri Jul 3 08:02:55 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: arch.c,v 1.72 2020/07/02 15:47:38 rillig Exp $ */
+/* $NetBSD: arch.c,v 1.73 2020/07/03 08:02:55 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: arch.c,v 1.72 2020/07/02 15:47:38 rillig Exp $";
+static char rcsid[] = "$NetBSD: arch.c,v 1.73 2020/07/03 08:02:55 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)arch.c 8.2 (Berkeley) 1/2/94";
#else
-__RCSID("$NetBSD: arch.c,v 1.72 2020/07/02 15:47:38 rillig Exp $");
+__RCSID("$NetBSD: arch.c,v 1.73 2020/07/03 08:02:55 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -264,7 +264,7 @@ Arch_ParseArchive(char **linePtr, Lst no
free(freeIt);
if (result == var_Error) {
- return(FAILURE);
+ return FAILURE;
} else {
subLibName = TRUE;
}
@@ -306,7 +306,7 @@ Arch_ParseArchive(char **linePtr, Lst no
free(freeIt);
if (result == var_Error) {
- return(FAILURE);
+ return FAILURE;
} else {
doSubst = TRUE;
}
@@ -324,7 +324,7 @@ Arch_ParseArchive(char **linePtr, Lst no
*/
if (*cp == '\0') {
printf("No closing parenthesis in archive specification\n");
- return (FAILURE);
+ return FAILURE;
}
/*
@@ -378,7 +378,7 @@ Arch_ParseArchive(char **linePtr, Lst no
if (gn == NULL) {
free(buf);
- return(FAILURE);
+ return FAILURE;
} else {
gn->type |= OP_ARCHV;
(void)Lst_AtEnd(nodeLst, gn);
@@ -389,7 +389,7 @@ Arch_ParseArchive(char **linePtr, Lst no
* ourselves.
*/
free(buf);
- return(FAILURE);
+ return FAILURE;
}
/*
* Free buffer and continue with our work.
@@ -413,7 +413,7 @@ Arch_ParseArchive(char **linePtr, Lst no
gn = Targ_FindNode(nameBuf, TARG_CREATE);
if (gn == NULL) {
free(nameBuf);
- return (FAILURE);
+ return FAILURE;
} else {
/*
* We've found the node, but have to make sure the rest of
@@ -435,7 +435,7 @@ Arch_ParseArchive(char **linePtr, Lst no
gn = Targ_FindNode(nameBuf, TARG_CREATE);
free(nameBuf);
if (gn == NULL) {
- return (FAILURE);
+ return FAILURE;
} else {
/*
* We've found the node, but have to make sure the rest of the
@@ -472,7 +472,7 @@ Arch_ParseArchive(char **linePtr, Lst no
} while (*cp != '\0' && isspace ((unsigned char)*cp));
*linePtr = cp;
- return (SUCCESS);
+ return SUCCESS;
}
/*-
@@ -496,7 +496,7 @@ Arch_ParseArchive(char **linePtr, Lst no
static int
ArchFindArchive(const void *ar, const void *archName)
{
- return (strcmp(archName, ((const Arch *)ar)->name));
+ return strcmp(archName, ((const Arch *)ar)->name);
}
/*-
@@ -555,7 +555,7 @@ ArchStatMember(char *archive, char *memb
he = Hash_FindEntry(&ar->members, member);
if (he != NULL) {
- return ((struct ar_hdr *)Hash_GetValue(he));
+ return (struct ar_hdr *)Hash_GetValue(he);
} else {
/* Try truncated name */
char copy[AR_MAX_NAME_LEN+1];
@@ -567,7 +567,7 @@ ArchStatMember(char *archive, char *memb
copy[AR_MAX_NAME_LEN] = '\0';
}
if ((he = Hash_FindEntry(&ar->members, copy)) != NULL)
- return ((struct ar_hdr *)Hash_GetValue(he));
+ return (struct ar_hdr *)Hash_GetValue(he);
return NULL;
}
}
@@ -588,7 +588,7 @@ ArchStatMember(char *archive, char *memb
return NULL;
} else {
fclose(arch);
- return (&sarh);
+ return &sarh;
}
}
@@ -706,7 +706,7 @@ ArchStatMember(char *archive, char *memb
he = Hash_FindEntry(&ar->members, member);
if (he != NULL) {
- return ((struct ar_hdr *)Hash_GetValue(he));
+ return (struct ar_hdr *)Hash_GetValue(he);
} else {
return NULL;
}
@@ -915,7 +915,7 @@ ArchFindMember(char *archive, char *memb
fclose(arch);
return NULL;
}
- return (arch);
+ return arch;
}
} else
#ifdef AR_EFMT1
@@ -949,7 +949,7 @@ ArchFindMember(char *archive, char *memb
fclose(arch);
return NULL;
}
- return (arch);
+ return arch;
}
if (fseek(arch, -elen, SEEK_CUR) != 0) {
fclose(arch);
@@ -1105,7 +1105,7 @@ Arch_MTime(GNode *gn)
}
gn->mtime = modTime;
- return (modTime);
+ return modTime;
}
/*-
@@ -1132,7 +1132,7 @@ Arch_MemMTime(GNode *gn)
if (Lst_Open(gn->parents) != SUCCESS) {
gn->mtime = 0;
- return (0);
+ return 0;
}
while ((ln = Lst_Next(gn->parents)) != NULL) {
pgn = (GNode *)Lst_Datum(ln);
@@ -1164,7 +1164,7 @@ Arch_MemMTime(GNode *gn)
Lst_Close(gn->parents);
- return (gn->mtime);
+ return gn->mtime;
}
/*-
@@ -1290,7 +1290,7 @@ Arch_LibOODate(GNode *gn)
oodate = FALSE;
#endif
}
- return (oodate);
+ return oodate;
}
/*-
Index: src/usr.bin/make/buf.c
diff -u src/usr.bin/make/buf.c:1.25 src/usr.bin/make/buf.c:1.26
--- src/usr.bin/make/buf.c:1.25 Tue Apr 24 20:26:58 2012
+++ src/usr.bin/make/buf.c Fri Jul 3 08:02:55 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: buf.c,v 1.25 2012/04/24 20:26:58 sjg Exp $ */
+/* $NetBSD: buf.c,v 1.26 2020/07/03 08:02:55 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: buf.c,v 1.25 2012/04/24 20:26:58 sjg Exp $";
+static char rcsid[] = "$NetBSD: buf.c,v 1.26 2020/07/03 08:02:55 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)buf.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: buf.c,v 1.25 2012/04/24 20:26:58 sjg Exp $");
+__RCSID("$NetBSD: buf.c,v 1.26 2020/07/03 08:02:55 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -160,7 +160,7 @@ Buf_GetAll(Buffer *bp, int *numBytesPtr)
if (numBytesPtr != NULL)
*numBytesPtr = bp->count;
- return (bp->buffer);
+ return bp->buffer;
}
/*-
Index: src/usr.bin/make/compat.c
diff -u src/usr.bin/make/compat.c:1.111 src/usr.bin/make/compat.c:1.112
--- src/usr.bin/make/compat.c:1.111 Thu Jul 2 15:47:38 2020
+++ src/usr.bin/make/compat.c Fri Jul 3 08:02:55 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: compat.c,v 1.111 2020/07/02 15:47:38 rillig Exp $ */
+/* $NetBSD: compat.c,v 1.112 2020/07/03 08:02:55 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: compat.c,v 1.111 2020/07/02 15:47:38 rillig Exp $";
+static char rcsid[] = "$NetBSD: compat.c,v 1.112 2020/07/03 08:02:55 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)compat.c 8.2 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: compat.c,v 1.111 2020/07/02 15:47:38 rillig Exp $");
+__RCSID("$NetBSD: compat.c,v 1.112 2020/07/03 08:02:55 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -246,18 +246,18 @@ CompatRunCommand(void *cmdp, void *gnp)
if (*cmdStart == '\0') {
free(cmdStart);
- return(0);
+ return 0;
}
cmd = cmdStart;
Lst_Replace(cmdNode, cmdStart);
if ((gn->type & OP_SAVE_CMDS) && (gn != ENDNode)) {
(void)Lst_AtEnd(ENDNode->commands, cmdStart);
- return(0);
+ return 0;
}
if (strcmp(cmdStart, "...") == 0) {
gn->type |= OP_SAVE_CMDS;
- return(0);
+ return 0;
}
while ((*cmd == '@') || (*cmd == '-') || (*cmd == '+')) {
@@ -284,7 +284,7 @@ CompatRunCommand(void *cmdp, void *gnp)
* If we did not end up with a command, just skip it.
*/
if (!*cmd)
- return (0);
+ return 0;
#if !defined(MAKE_NATIVE)
/*
@@ -322,7 +322,7 @@ CompatRunCommand(void *cmdp, void *gnp)
* we go...
*/
if (!doIt && NoExecute(gn)) {
- return (0);
+ return 0;
}
if (DEBUG(JOB))
fprintf(debug_file, "Execute: '%s'\n", cmd);
@@ -497,7 +497,7 @@ again:
kill(myPid, compatSigno);
}
- return (status);
+ return status;
}
/*-
@@ -678,7 +678,7 @@ Compat_Make(void *gnp, void *pgnp)
cohorts:
Lst_ForEach(gn->cohorts, Compat_Make, pgnp);
- return (0);
+ return 0;
}
/*-
Index: src/usr.bin/make/cond.c
diff -u src/usr.bin/make/cond.c:1.76 src/usr.bin/make/cond.c:1.77
--- src/usr.bin/make/cond.c:1.76 Sun Jun 28 11:06:26 2020
+++ src/usr.bin/make/cond.c Fri Jul 3 08:02:55 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cond.c,v 1.76 2020/06/28 11:06:26 rillig Exp $ */
+/* $NetBSD: cond.c,v 1.77 2020/07/03 08:02:55 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: cond.c,v 1.76 2020/06/28 11:06:26 rillig Exp $";
+static char rcsid[] = "$NetBSD: cond.c,v 1.77 2020/07/03 08:02:55 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)cond.c 8.2 (Berkeley) 1/2/94";
#else
-__RCSID("$NetBSD: cond.c,v 1.76 2020/06/28 11:06:26 rillig Exp $");
+__RCSID("$NetBSD: cond.c,v 1.77 2020/07/03 08:02:55 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -256,7 +256,7 @@ CondGetArg(Boolean doEval, char **linePt
* the word 'make' or 'defined' at the beginning of a symbol...
*/
*argPtr = NULL;
- return (0);
+ return 0;
}
while (*cp == ' ' || *cp == '\t') {
@@ -314,11 +314,11 @@ CondGetArg(Boolean doEval, char **linePt
if (func != NULL && *cp++ != ')') {
Parse_Error(PARSE_WARNING, "Missing closing parenthesis for %s()",
func);
- return (0);
+ return 0;
}
*linePtr = cp;
- return (argLen);
+ return argLen;
}
/*-
@@ -347,7 +347,7 @@ CondDoDefined(int argLen MAKE_ATTR_UNUSE
}
free(p1);
- return (result);
+ return result;
}
/*-
@@ -367,7 +367,7 @@ CondDoDefined(int argLen MAKE_ATTR_UNUSE
static int
CondStrMatch(const void *string, const void *pattern)
{
- return(!Str_Match(string, pattern));
+ return !Str_Match(string, pattern);
}
/*-
@@ -419,7 +419,7 @@ CondDoExists(int argLen MAKE_ATTR_UNUSED
} else {
result = FALSE;
}
- return (result);
+ return result;
}
/*-
@@ -441,7 +441,7 @@ CondDoTarget(int argLen MAKE_ATTR_UNUSED
GNode *gn;
gn = Targ_FindNode(arg, TARG_NOCREATE);
- return (gn != NULL) && !OP_NOP(gn->type);
+ return gn != NULL && !OP_NOP(gn->type);
}
/*-
@@ -465,7 +465,7 @@ CondDoCommands(int argLen MAKE_ATTR_UNUS
GNode *gn;
gn = Targ_FindNode(arg, TARG_NOCREATE);
- return (gn != NULL) && !OP_NOP(gn->type) && !Lst_IsEmpty(gn->commands);
+ return gn != NULL && !OP_NOP(gn->type) && !Lst_IsEmpty(gn->commands);
}
/*-
@@ -1038,7 +1038,7 @@ CondT(Boolean doEval)
t = TOK_TRUE;
}
}
- return (t);
+ return t;
}
/*-
@@ -1084,7 +1084,7 @@ CondF(Boolean doEval)
CondPushBack(o);
}
}
- return (l);
+ return l;
}
/*-
@@ -1131,7 +1131,7 @@ CondE(Boolean doEval)
CondPushBack(o);
}
}
- return (l);
+ return l;
}
/*-
Index: src/usr.bin/make/dir.c
diff -u src/usr.bin/make/dir.c:1.74 src/usr.bin/make/dir.c:1.75
--- src/usr.bin/make/dir.c:1.74 Fri Jun 5 18:03:59 2020
+++ src/usr.bin/make/dir.c Fri Jul 3 08:02:55 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: dir.c,v 1.74 2020/06/05 18:03:59 sjg Exp $ */
+/* $NetBSD: dir.c,v 1.75 2020/07/03 08:02:55 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: dir.c,v 1.74 2020/06/05 18:03:59 sjg Exp $";
+static char rcsid[] = "$NetBSD: dir.c,v 1.75 2020/07/03 08:02:55 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)dir.c 8.2 (Berkeley) 1/2/94";
#else
-__RCSID("$NetBSD: dir.c,v 1.74 2020/06/05 18:03:59 sjg Exp $");
+__RCSID("$NetBSD: dir.c,v 1.75 2020/07/03 08:02:55 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -537,7 +537,7 @@ Dir_SetPATH(void)
static int
DirFindName(const void *p, const void *dname)
{
- return (strcmp(((const Path *)p)->name, dname));
+ return strcmp(((const Path *)p)->name, dname);
}
/*-
@@ -644,7 +644,7 @@ DirMatchFiles(const char *pattern, Path
STR_ADDSLASH)));
}
}
- return (0);
+ return 0;
}
/*-
@@ -1004,7 +1004,7 @@ DirLookupSubdir(Path *p, const char *nam
if (cached_stat(file, &stb) == 0) {
nearmisses += 1;
- return (file);
+ return file;
}
free(file);
return NULL;
@@ -1061,7 +1061,7 @@ DirLookupAbs(Path *p, const char *name,
if (DEBUG(DIR)) {
fprintf(debug_file, " returning %s\n", name);
}
- return (bmake_strdup(name));
+ return bmake_strdup(name);
}
/*-
@@ -1087,7 +1087,7 @@ DirFindDot(Boolean hasSlash MAKE_ATTR_UN
}
hits += 1;
dot->hits += 1;
- return (bmake_strdup(name));
+ return bmake_strdup(name);
}
if (cur &&
Hash_FindEntry(&cur->files, cp) != NULL) {
@@ -1384,7 +1384,7 @@ Dir_FindFile(const char *name, Lst path)
}
if (Hash_FindEntry(&p->files, cp) != NULL) {
- return (bmake_strdup(name));
+ return bmake_strdup(name);
} else {
return NULL;
}
@@ -1395,7 +1395,7 @@ Dir_FindFile(const char *name, Lst path)
bigmisses += 1;
if (cached_stat(name, &stb) == 0) {
- return (bmake_strdup(name));
+ return bmake_strdup(name);
}
if (DEBUG(DIR)) {
@@ -1459,7 +1459,7 @@ Dir_FindHereOrAbove(char *here, char *se
* done!
*/
snprintf(result, rlen, "%s", try);
- return(1);
+ return 1;
}
/*
@@ -1481,7 +1481,7 @@ Dir_FindHereOrAbove(char *here, char *se
/*
* we failed...
*/
- return(0);
+ return 0;
}
/*-
@@ -1572,7 +1572,7 @@ Dir_MTime(GNode *gn, Boolean recheck)
}
gn->mtime = stb.st_mtime;
- return (gn->mtime);
+ return gn->mtime;
}
/*-
@@ -1677,7 +1677,7 @@ Dir_CopyDir(void *p)
{
((Path *)p)->refCount += 1;
- return (p);
+ return p;
}
/*-
@@ -1722,7 +1722,7 @@ Dir_MakeFlags(const char *flag, Lst path
Lst_Close(path);
}
- return (str);
+ return str;
}
/*-
Index: src/usr.bin/make/hash.c
diff -u src/usr.bin/make/hash.c:1.20 src/usr.bin/make/hash.c:1.21
--- src/usr.bin/make/hash.c:1.20 Thu Nov 14 00:27:05 2013
+++ src/usr.bin/make/hash.c Fri Jul 3 08:02:55 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: hash.c,v 1.20 2013/11/14 00:27:05 sjg Exp $ */
+/* $NetBSD: hash.c,v 1.21 2020/07/03 08:02:55 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: hash.c,v 1.20 2013/11/14 00:27:05 sjg Exp $";
+static char rcsid[] = "$NetBSD: hash.c,v 1.21 2020/07/03 08:02:55 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)hash.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: hash.c,v 1.20 2013/11/14 00:27:05 sjg Exp $");
+__RCSID("$NetBSD: hash.c,v 1.21 2020/07/03 08:02:55 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -229,7 +229,7 @@ Hash_FindEntry(Hash_Table *t, const char
p = key;
for (e = t->bucketPtr[h & t->mask]; e != NULL; e = e->next)
if (e->namehash == h && strcmp(e->name, p) == 0)
- return (e);
+ return e;
return NULL;
}
@@ -279,7 +279,7 @@ Hash_CreateEntry(Hash_Table *t, const ch
if (e->namehash == h && strcmp(e->name, p) == 0) {
if (newPtr != NULL)
*newPtr = FALSE;
- return (e);
+ return e;
}
}
@@ -301,7 +301,7 @@ Hash_CreateEntry(Hash_Table *t, const ch
if (newPtr != NULL)
*newPtr = TRUE;
- return (e);
+ return e;
}
/*
@@ -418,7 +418,7 @@ Hash_EnumNext(Hash_Search *searchPtr)
e = t->bucketPtr[searchPtr->nextIndex++];
}
searchPtr->hashEntryPtr = e;
- return (e);
+ return e;
}
/*
Index: src/usr.bin/make/job.c
diff -u src/usr.bin/make/job.c:1.199 src/usr.bin/make/job.c:1.200
--- src/usr.bin/make/job.c:1.199 Thu Jul 2 15:47:38 2020
+++ src/usr.bin/make/job.c Fri Jul 3 08:02:55 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: job.c,v 1.199 2020/07/02 15:47:38 rillig Exp $ */
+/* $NetBSD: job.c,v 1.200 2020/07/03 08:02:55 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: job.c,v 1.199 2020/07/02 15:47:38 rillig Exp $";
+static char rcsid[] = "$NetBSD: job.c,v 1.200 2020/07/03 08:02:55 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)job.c 8.2 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: job.c,v 1.199 2020/07/02 15:47:38 rillig Exp $");
+__RCSID("$NetBSD: job.c,v 1.200 2020/07/03 08:02:55 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -919,7 +919,7 @@ JobSaveCommand(void *cmd, void *gn)
{
cmd = Var_Subst(NULL, (char *)cmd, (GNode *)gn, VARF_WANTRES);
(void)Lst_AtEnd(postCommands->commands, cmd);
- return(0);
+ return 0;
}
@@ -1749,7 +1749,7 @@ JobStart(GNode *gn, int flags)
JobCreatePipe(job, 3);
JobExec(job, argv);
- return(JOB_RUNNING);
+ return JOB_RUNNING;
}
static char *
@@ -2391,7 +2391,7 @@ JobMatchShell(const char *name)
for (sh = shells; sh->name != NULL; sh++) {
if (strcmp(name, sh->name) == 0)
- return (sh);
+ return sh;
}
return NULL;
}
@@ -2507,7 +2507,7 @@ Job_ParseShell(char *line)
Parse_Error(PARSE_FATAL, "Unknown keyword \"%s\"",
*argv);
free(words);
- return(FAILURE);
+ return FAILURE;
}
fullSpec = TRUE;
}
@@ -2523,13 +2523,13 @@ Job_ParseShell(char *line)
if (newShell.name == NULL) {
Parse_Error(PARSE_FATAL, "Neither path nor name specified");
free(words);
- return(FAILURE);
+ return FAILURE;
} else {
if ((sh = JobMatchShell(newShell.name)) == NULL) {
Parse_Error(PARSE_WARNING, "%s: No matching shell",
newShell.name);
free(words);
- return(FAILURE);
+ return FAILURE;
}
commandShell = sh;
shellName = newShell.name;
@@ -2565,7 +2565,7 @@ Job_ParseShell(char *line)
Parse_Error(PARSE_WARNING, "%s: No matching shell",
shellName);
free(words);
- return(FAILURE);
+ return FAILURE;
}
commandShell = sh;
} else {
@@ -2682,7 +2682,7 @@ Job_Finish(void)
JobRun(postCommands);
}
}
- return(errors);
+ return errors;
}
/*-
Index: src/usr.bin/make/main.c
diff -u src/usr.bin/make/main.c:1.277 src/usr.bin/make/main.c:1.278
--- src/usr.bin/make/main.c:1.277 Thu Jul 2 15:47:38 2020
+++ src/usr.bin/make/main.c Fri Jul 3 08:02:55 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.277 2020/07/02 15:47:38 rillig Exp $ */
+/* $NetBSD: main.c,v 1.278 2020/07/03 08:02:55 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,7 +69,7 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: main.c,v 1.277 2020/07/02 15:47:38 rillig Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.278 2020/07/03 08:02:55 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
@@ -81,7 +81,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 19
#if 0
static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: main.c,v 1.277 2020/07/02 15:47:38 rillig Exp $");
+__RCSID("$NetBSD: main.c,v 1.278 2020/07/03 08:02:55 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -791,7 +791,7 @@ Main_SetVarObjdir(const char *var, const
static int
ReadAllMakefiles(const void *p, const void *q)
{
- return (ReadMakefile(p, q) == 0);
+ return ReadMakefile(p, q) == 0;
}
int
@@ -807,7 +807,7 @@ str2Lst_Append(Lst lp, char *str, const
(void)Lst_AtEnd(lp, cp);
n++;
}
- return (n);
+ return n;
}
#ifdef SIGINFO
@@ -1556,7 +1556,7 @@ ReadMakefile(const void *p, const void *
if (!name || (fd = open(name, O_RDONLY)) == -1) {
free(name);
free(path);
- return(-1);
+ return -1;
}
fname = name;
/*
@@ -1570,7 +1570,7 @@ found:
Parse_File(fname, fd);
}
free(path);
- return(0);
+ return 0;
}
@@ -2190,7 +2190,7 @@ s2Boolean(const char *s, Boolean bf)
break;
}
}
- return (bf);
+ return bf;
}
/*
@@ -2214,5 +2214,5 @@ getBoolean(const char *name, Boolean bf)
free(cp);
}
}
- return (bf);
+ return bf;
}
Index: src/usr.bin/make/make.c
diff -u src/usr.bin/make/make.c:1.97 src/usr.bin/make/make.c:1.98
--- src/usr.bin/make/make.c:1.97 Thu Jul 2 15:47:38 2020
+++ src/usr.bin/make/make.c Fri Jul 3 08:02:55 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: make.c,v 1.97 2020/07/02 15:47:38 rillig Exp $ */
+/* $NetBSD: make.c,v 1.98 2020/07/03 08:02:55 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: make.c,v 1.97 2020/07/02 15:47:38 rillig Exp $";
+static char rcsid[] = "$NetBSD: make.c,v 1.98 2020/07/03 08:02:55 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)make.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: make.c,v 1.97 2020/07/02 15:47:38 rillig Exp $");
+__RCSID("$NetBSD: make.c,v 1.98 2020/07/03 08:02:55 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -175,7 +175,7 @@ Make_TimeStamp(GNode *pgn, GNode *cgn)
if (pgn->cmgn == NULL || cgn->mtime > pgn->cmgn->mtime) {
pgn->cmgn = cgn;
}
- return (0);
+ return 0;
}
/*
@@ -348,7 +348,7 @@ Make_OODate(GNode *gn)
Lst_ForEach(gn->parents, MakeTimeStamp, gn);
}
- return (oodate);
+ return oodate;
}
/*-
@@ -380,7 +380,7 @@ MakeAddChild(void *gnp, void *lp)
gn->name, gn->cohort_num);
(void)Lst_EnQueue(l, gn);
}
- return (0);
+ return 0;
}
/*-
@@ -410,7 +410,7 @@ MakeFindChild(void *gnp, void *pgnp)
Make_TimeStamp(pgn, gn);
pgn->unmade--;
- return (0);
+ return 0;
}
/*-
@@ -535,7 +535,7 @@ MakeHandleUse(void *cgnp, void *pgnp)
cgn->type |= OP_MARK;
if ((cgn->type & (OP_USE|OP_USEBEFORE)) == 0)
- return (0);
+ return 0;
if (unmarked)
Make_HandleUse(cgn, pgn);
@@ -551,7 +551,7 @@ MakeHandleUse(void *cgnp, void *pgnp)
Lst_Remove(pgn->children, ln);
pgn->unmade--;
}
- return (0);
+ return 0;
}
@@ -869,7 +869,7 @@ MakeUnmark(void *cgnp, void *pgnp MAKE_A
GNode *cgn = (GNode *)cgnp;
cgn->type &= ~OP_MARK;
- return (0);
+ return 0;
}
/*
@@ -886,7 +886,7 @@ MakeAddAllSrc(void *cgnp, void *pgnp)
GNode *pgn = (GNode *)pgnp;
if (cgn->type & OP_MARK)
- return (0);
+ return 0;
cgn->type |= OP_MARK;
if ((cgn->type & (OP_EXEC|OP_USE|OP_USEBEFORE|OP_INVISIBLE)) == 0) {
@@ -932,7 +932,7 @@ MakeAddAllSrc(void *cgnp, void *pgnp)
}
free(p1);
}
- return (0);
+ return 0;
}
/*-
@@ -1119,7 +1119,7 @@ MakeStartJobs(void)
fprintf(debug_file, "out-of-date\n");
}
if (queryFlag) {
- return (TRUE);
+ return TRUE;
}
Make_DoAllVar(gn);
Job_Make(gn);
@@ -1145,7 +1145,7 @@ MakeStartJobs(void)
if (have_token)
Job_TokenReturn();
- return (FALSE);
+ return FALSE;
}
/*-
@@ -1509,7 +1509,7 @@ Make_Run(Lst targs)
* next loop... (we won't actually start any, of course, this is just
* to see if any of the targets was out of date)
*/
- return (MakeStartJobs());
+ return MakeStartJobs();
}
/*
* Initialization. At the moment, no jobs are running and until some
Index: src/usr.bin/make/make_malloc.c
diff -u src/usr.bin/make/make_malloc.c:1.11 src/usr.bin/make/make_malloc.c:1.12
--- src/usr.bin/make/make_malloc.c:1.11 Sun Apr 16 20:20:24 2017
+++ src/usr.bin/make/make_malloc.c Fri Jul 3 08:02:55 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: make_malloc.c,v 1.11 2017/04/16 20:20:24 dholland Exp $ */
+/* $NetBSD: make_malloc.c,v 1.12 2020/07/03 08:02:55 rillig Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
#ifdef MAKE_NATIVE
#include <sys/cdefs.h>
-__RCSID("$NetBSD: make_malloc.c,v 1.11 2017/04/16 20:20:24 dholland Exp $");
+__RCSID("$NetBSD: make_malloc.c,v 1.12 2020/07/03 08:02:55 rillig Exp $");
#endif
#include <stdio.h>
@@ -63,7 +63,7 @@ bmake_malloc(size_t len)
if ((p = malloc(len)) == NULL)
enomem();
- return(p);
+ return p;
}
/*
@@ -102,7 +102,7 @@ bmake_strndup(const char *str, size_t ma
memcpy(p, str, len);
p[len] = '\0';
- return(p);
+ return p;
}
/*
@@ -114,6 +114,6 @@ bmake_realloc(void *ptr, size_t size)
{
if ((ptr = realloc(ptr, size)) == NULL)
enomem();
- return(ptr);
+ return ptr;
}
#endif
Index: src/usr.bin/make/meta.c
diff -u src/usr.bin/make/meta.c:1.83 src/usr.bin/make/meta.c:1.84
--- src/usr.bin/make/meta.c:1.83 Thu Jul 2 15:47:38 2020
+++ src/usr.bin/make/meta.c Fri Jul 3 08:02:55 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: meta.c,v 1.83 2020/07/02 15:47:38 rillig Exp $ */
+/* $NetBSD: meta.c,v 1.84 2020/07/03 08:02:55 rillig Exp $ */
/*
* Implement 'meta' mode.
@@ -304,7 +304,7 @@ meta_name(struct GNode *gn, char *mname,
}
}
free(tp);
- return (mname);
+ return mname;
}
/*
@@ -355,7 +355,7 @@ is_submake(void *cmdp, void *gnp)
}
}
free(mp);
- return (rc);
+ return rc;
}
typedef struct meta_file_s {
@@ -545,7 +545,7 @@ meta_create(BuildMon *pbm, GNode *gn)
free(p[i]);
}
- return (mf.fp);
+ return mf.fp;
}
static Boolean
@@ -951,7 +951,7 @@ prefix_match(void *p, void *q)
const char *path = q;
size_t n = strlen(prefix);
- return (0 == strncmp(path, prefix, n));
+ return strncmp(path, prefix, n) == 0;
}
/*
Index: src/usr.bin/make/parse.c
diff -u src/usr.bin/make/parse.c:1.234 src/usr.bin/make/parse.c:1.235
--- src/usr.bin/make/parse.c:1.234 Thu Jul 2 15:47:38 2020
+++ src/usr.bin/make/parse.c Fri Jul 3 08:02:55 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.234 2020/07/02 15:47:38 rillig Exp $ */
+/* $NetBSD: parse.c,v 1.235 2020/07/03 08:02:55 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: parse.c,v 1.234 2020/07/02 15:47:38 rillig Exp $";
+static char rcsid[] = "$NetBSD: parse.c,v 1.235 2020/07/03 08:02:55 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)parse.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: parse.c,v 1.234 2020/07/02 15:47:38 rillig Exp $");
+__RCSID("$NetBSD: parse.c,v 1.235 2020/07/03 08:02:55 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -642,14 +642,14 @@ ParseFindKeyword(const char *str)
diff = strcmp(str, parseKeywords[cur].name);
if (diff == 0) {
- return (cur);
+ return cur;
} else if (diff < 0) {
end = cur - 1;
} else {
start = cur + 1;
}
} while (start <= end);
- return (-1);
+ return -1;
}
/*-
@@ -874,7 +874,7 @@ ParseLinkSrc(void *pgnp, void *cgnp)
Targ_PrintNode(pgn, 0);
Targ_PrintNode(cgn, 0);
}
- return (0);
+ return 0;
}
/*-
@@ -911,7 +911,7 @@ ParseDoOp(void *gnp, void *opp)
!OP_NOP(gn->type) && !OP_NOP(op))
{
Parse_Error(PARSE_FATAL, "Inconsistent operator for %s", gn->name);
- return (1);
+ return 1;
}
if ((op == OP_DOUBLEDEP) && ((gn->type & OP_OPMASK) == OP_DOUBLEDEP)) {
@@ -955,7 +955,7 @@ ParseDoOp(void *gnp, void *opp)
gn->type |= op;
}
- return (0);
+ return 0;
}
/*-
@@ -1131,7 +1131,7 @@ static int
ParseAddDir(void *path, void *name)
{
(void)Dir_AddDir((Lst) path, (char *)name);
- return(0);
+ return 0;
}
/*-
@@ -2100,7 +2100,7 @@ ParseAddCmd(void *gnp, void *cmd)
gn->name);
#endif
}
- return(0);
+ return 0;
}
/*-
@@ -2757,7 +2757,7 @@ ParseEOF(void)
/* Restore the PARSEDIR/PARSEFILE variables */
ParseSetParseFile(curFile->fname);
- return (CONTINUE);
+ return CONTINUE;
}
#define PARSE_RAW 1
@@ -2994,7 +2994,7 @@ ParseReadLine(void)
/* Read next line from for-loop buffer */
continue;
}
- return (line);
+ return line;
}
}
@@ -3335,7 +3335,7 @@ Parse_MainName(void)
else
(void)Lst_AtEnd(mainList, mainNode);
Var_Append(".TARGETS", mainNode->name, VAR_GLOBAL);
- return (mainList);
+ return mainList;
}
/*-
Index: src/usr.bin/make/suff.c
diff -u src/usr.bin/make/suff.c:1.87 src/usr.bin/make/suff.c:1.88
--- src/usr.bin/make/suff.c:1.87 Thu Jul 2 15:47:38 2020
+++ src/usr.bin/make/suff.c Fri Jul 3 08:02:55 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: suff.c,v 1.87 2020/07/02 15:47:38 rillig Exp $ */
+/* $NetBSD: suff.c,v 1.88 2020/07/03 08:02:55 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: suff.c,v 1.87 2020/07/02 15:47:38 rillig Exp $";
+static char rcsid[] = "$NetBSD: suff.c,v 1.88 2020/07/03 08:02:55 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)suff.c 8.4 (Berkeley) 3/21/94";
#else
-__RCSID("$NetBSD: suff.c,v 1.87 2020/07/02 15:47:38 rillig Exp $");
+__RCSID("$NetBSD: suff.c,v 1.88 2020/07/03 08:02:55 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -266,7 +266,7 @@ SuffStrIsPrefix(const char *pref, const
str++;
}
- return (*pref ? NULL : str);
+ return *pref ? NULL : str;
}
/*-
@@ -304,7 +304,7 @@ SuffSuffIsSuffix(const Suff *s, const Su
p2--;
}
- return (p1 == s->name - 1 ? p2 : NULL);
+ return p1 == s->name - 1 ? p2 : NULL;
}
/*-
@@ -324,7 +324,7 @@ SuffSuffIsSuffix(const Suff *s, const Su
static int
SuffSuffIsSuffixP(const void *s, const void *sd)
{
- return(!SuffSuffIsSuffix(s, sd));
+ return !SuffSuffIsSuffix(s, sd);
}
/*-
@@ -347,7 +347,7 @@ SuffSuffIsSuffixP(const void *s, const v
static int
SuffSuffHasNameP(const void *s, const void *sname)
{
- return (strcmp(sname, ((const Suff *)s)->name));
+ return strcmp(sname, ((const Suff *)s)->name);
}
/*-
@@ -394,7 +394,7 @@ SuffSuffIsPrefix(const void *s, const vo
static int
SuffGNHasNameP(const void *gn, const void *name)
{
- return (strcmp(name, ((const GNode *)gn)->name));
+ return strcmp(name, ((const GNode *)gn)->name);
}
/*********** Maintenance Functions ************/
@@ -632,9 +632,9 @@ SuffParseTransform(char *str, Suff **src
*/
*srcPtr = single;
*targPtr = suffNull;
- return(TRUE);
+ return TRUE;
}
- return (FALSE);
+ return FALSE;
}
src = (Suff *)Lst_Datum(srcLn);
str2 = str + src->nameLen;
@@ -646,7 +646,7 @@ SuffParseTransform(char *str, Suff **src
if (targLn != NULL) {
*srcPtr = src;
*targPtr = (Suff *)Lst_Datum(targLn);
- return (TRUE);
+ return TRUE;
}
}
}
@@ -674,7 +674,7 @@ Suff_IsTransform(char *str)
{
Suff *src, *targ;
- return (SuffParseTransform(str, &src, &targ));
+ return SuffParseTransform(str, &src, &targ);
}
/*-
@@ -738,7 +738,7 @@ Suff_AddTransform(char *line)
SuffInsert(t->children, s);
SuffInsert(s->parents, t);
- return (gn);
+ return gn;
}
/*-
@@ -860,7 +860,7 @@ SuffRebuildGraph(void *transformp, void
s2 = (Suff *)Lst_Datum(ln);
SuffInsert(s2->children, s);
SuffInsert(s->parents, s2);
- return(0);
+ return 0;
}
}
@@ -889,7 +889,7 @@ SuffRebuildGraph(void *transformp, void
SuffInsert(s2->parents, s);
}
}
- return(0);
+ return 0;
}
/*-
@@ -1035,7 +1035,7 @@ Suff_GetPath(char *sname)
return NULL;
} else {
s = (Suff *)Lst_Datum(ln);
- return (s->searchPath);
+ return s->searchPath;
}
}
@@ -1239,7 +1239,7 @@ SuffAddSrc(void *sp, void *lsp)
fprintf(debug_file, "\n");
#endif
- return(0);
+ return 0;
}
/*-
@@ -1399,7 +1399,7 @@ SuffFindThem(Lst srcs, Lst slst)
if (DEBUG(SUFF) && rs) {
fprintf(debug_file, "got it\n");
}
- return (rs);
+ return rs;
}
/*-
@@ -1505,7 +1505,7 @@ SuffFindCmds(Src *targ, Lst slst)
if (DEBUG(SUFF)) {
fprintf(debug_file, "\tusing existing source %s\n", s->name);
}
- return (ret);
+ return ret;
}
/*-
@@ -1831,7 +1831,7 @@ SuffApplyTransform(GNode *tGn, GNode *sG
* called to link an OP_MEMBER and OP_ARCHV node), so return
* FALSE.
*/
- return(FALSE);
+ return FALSE;
}
gn = (GNode *)Lst_Datum(ln);
@@ -1864,7 +1864,7 @@ SuffApplyTransform(GNode *tGn, GNode *sG
*/
(void)Lst_AtEnd(sGn->iParents, tGn);
- return(TRUE);
+ return TRUE;
}
Index: src/usr.bin/make/targ.c
diff -u src/usr.bin/make/targ.c:1.62 src/usr.bin/make/targ.c:1.63
--- src/usr.bin/make/targ.c:1.62 Sun Apr 16 19:53:58 2017
+++ src/usr.bin/make/targ.c Fri Jul 3 08:02:55 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: targ.c,v 1.62 2017/04/16 19:53:58 riastradh Exp $ */
+/* $NetBSD: targ.c,v 1.63 2020/07/03 08:02:55 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: targ.c,v 1.62 2017/04/16 19:53:58 riastradh Exp $";
+static char rcsid[] = "$NetBSD: targ.c,v 1.63 2020/07/03 08:02:55 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)targ.c 8.2 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: targ.c,v 1.62 2017/04/16 19:53:58 riastradh Exp $");
+__RCSID("$NetBSD: targ.c,v 1.63 2020/07/03 08:02:55 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -269,7 +269,7 @@ Targ_NewGN(const char *name)
Lst_AtEnd(allGNs, gn);
#endif
- return (gn);
+ return gn;
}
#ifdef CLEANUP
@@ -389,7 +389,7 @@ Targ_FindList(Lst names, int flags)
nodes = Lst_Init(FALSE);
if (Lst_Open(names) == FAILURE) {
- return (nodes);
+ return nodes;
}
while ((ln = Lst_Next(names)) != NULL) {
name = (char *)Lst_Datum(ln);
@@ -406,7 +406,7 @@ Targ_FindList(Lst names, int flags)
}
}
Lst_Close(names);
- return (nodes);
+ return nodes;
}
/*-
@@ -428,9 +428,9 @@ Boolean
Targ_Ignore(GNode *gn)
{
if (ignoreErrors || gn->type & OP_IGNORE) {
- return (TRUE);
+ return TRUE;
} else {
- return (FALSE);
+ return FALSE;
}
}
@@ -453,9 +453,9 @@ Boolean
Targ_Silent(GNode *gn)
{
if (beSilent || gn->type & OP_SILENT) {
- return (TRUE);
+ return TRUE;
} else {
- return (FALSE);
+ return FALSE;
}
}
@@ -478,9 +478,9 @@ Boolean
Targ_Precious(GNode *gn)
{
if (allPrecious || (gn->type & (OP_PRECIOUS|OP_DOUBLEDEP))) {
- return (TRUE);
+ return TRUE;
} else {
- return (FALSE);
+ return FALSE;
}
}
@@ -549,7 +549,7 @@ Targ_FmtTime(time_t tm)
parts = localtime(&tm);
(void)strftime(buf, sizeof buf, "%k:%M:%S %b %d, %Y", parts);
- return(buf);
+ return buf;
}
/*-
@@ -698,7 +698,7 @@ Targ_PrintNode(void *gnp, void *passp)
Lst_ForEach(gn->cohorts, Targ_PrintNode, &pass);
}
}
- return (0);
+ return 0;
}
/*-
@@ -794,7 +794,7 @@ TargPropagateNode(void *gnp, void *junk
if (gn->type & OP_DOUBLEDEP)
Lst_ForEach(gn->cohorts, TargPropagateCohort, gnp);
- return (0);
+ return 0;
}
/*-
@@ -822,7 +822,7 @@ TargPropagateCohort(void *cgnp, void *pg
GNode *pgn = (GNode *)pgnp;
cgn->type |= pgn->type & ~OP_OPMASK;
- return (0);
+ return 0;
}
/*-
Index: src/usr.bin/make/util.c
diff -u src/usr.bin/make/util.c:1.55 src/usr.bin/make/util.c:1.56
--- src/usr.bin/make/util.c:1.55 Tue Jan 7 21:24:16 2020
+++ src/usr.bin/make/util.c Fri Jul 3 08:02:55 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: util.c,v 1.55 2020/01/07 21:24:16 rillig Exp $ */
+/* $NetBSD: util.c,v 1.56 2020/07/03 08:02:55 rillig Exp $ */
/*
* Missing stuff from OS's
@@ -8,11 +8,11 @@
#endif
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: util.c,v 1.55 2020/01/07 21:24:16 rillig Exp $";
+static char rcsid[] = "$NetBSD: util.c,v 1.56 2020/07/03 08:02:55 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: util.c,v 1.55 2020/01/07 21:24:16 rillig Exp $");
+__RCSID("$NetBSD: util.c,v 1.56 2020/07/03 08:02:55 rillig Exp $");
#endif
#endif
@@ -70,7 +70,7 @@ getenv(const char *name)
{
int offset;
- return(findenv(name, &offset));
+ return findenv(name, &offset);
}
int
@@ -174,7 +174,7 @@ strrcpy(char *ptr, char *str)
while (len)
*--ptr = str[--len];
- return (ptr);
+ return ptr;
} /* end strrcpy */
char *sys_siglist[] = {
@@ -276,7 +276,7 @@ getwd(char *pathname)
if (st_cur.st_ino == st_root.st_ino &&
DEV_DEV_COMPARE(st_cur.st_dev, st_root.st_dev)) {
(void)strcpy(pathname, *pathptr != '/' ? "/" : pathptr);
- return (pathname);
+ return pathname;
}
/* open the parent directory */
@@ -386,7 +386,7 @@ vsnprintf(char *s, size_t n, const char
putc('\0', &fakebuf);
if (fakebuf._cnt<0)
fakebuf._cnt = 0;
- return (n-fakebuf._cnt-1);
+ return n-fakebuf._cnt-1;
#else
(void)vsprintf(s, fmt, args);
return strlen(s);
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.233 src/usr.bin/make/var.c:1.234
--- src/usr.bin/make/var.c:1.233 Thu Jul 2 16:52:34 2020
+++ src/usr.bin/make/var.c Fri Jul 3 08:02:55 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.233 2020/07/02 16:52:34 rillig Exp $ */
+/* $NetBSD: var.c,v 1.234 2020/07/03 08:02:55 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: var.c,v 1.233 2020/07/02 16:52:34 rillig Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.234 2020/07/03 08:02:55 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)var.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: var.c,v 1.233 2020/07/02 16:52:34 rillig Exp $");
+__RCSID("$NetBSD: var.c,v 1.234 2020/07/03 08:02:55 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -1636,7 +1636,7 @@ VarSubstitute(GNode *ctx MAKE_ATTR_UNUSE
* before we add any more. If we didn't add any, just return
* the previous value of addSpace.
*/
- return ((Buf_Size(buf) != origSize) || addSpace);
+ return (Buf_Size(buf) != origSize) || addSpace;
}
return addSpace;
}
