Module Name: src
Committed By: rillig
Date: Mon Nov 16 22:31:42 UTC 2020
Modified Files:
src/usr.bin/make: make.c suff.c
Log Message:
make(1): clean up code style in make.c and suff.c
To generate a diff of this commit:
cvs rdiff -u -r1.208 -r1.209 src/usr.bin/make/make.c
cvs rdiff -u -r1.244 -r1.245 src/usr.bin/make/suff.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/make.c
diff -u src/usr.bin/make/make.c:1.208 src/usr.bin/make/make.c:1.209
--- src/usr.bin/make/make.c:1.208 Mon Nov 16 21:39:22 2020
+++ src/usr.bin/make/make.c Mon Nov 16 22:31:42 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: make.c,v 1.208 2020/11/16 21:39:22 rillig Exp $ */
+/* $NetBSD: make.c,v 1.209 2020/11/16 22:31:42 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -102,7 +102,7 @@
#include "job.h"
/* "@(#)make.c 8.1 (Berkeley) 6/6/93" */
-MAKE_RCSID("$NetBSD: make.c,v 1.208 2020/11/16 21:39:22 rillig Exp $");
+MAKE_RCSID("$NetBSD: make.c,v 1.209 2020/11/16 22:31:42 rillig Exp $");
/* Sequence # to detect recursion. */
static unsigned int checked_seqno = 1;
@@ -279,7 +279,7 @@ GNode_IsOODate(GNode *gn)
*/
DEBUG0(MAKE, ".JOIN node...");
DEBUG1(MAKE, "source %smade...", gn->flags & CHILDMADE ? "" : "not ");
- oodate = (gn->flags & CHILDMADE) ? TRUE : FALSE;
+ oodate = (gn->flags & CHILDMADE) != 0;
} else if (gn->type & (OP_FORCE|OP_EXEC|OP_PHONY)) {
/*
* A node which is the object of the force (!) operator or which has
@@ -309,7 +309,7 @@ GNode_IsOODate(GNode *gn)
if (gn->flags & FORCE)
debug_printf("non existing child...");
}
- oodate = (gn->flags & FORCE) ? TRUE : FALSE;
+ oodate = (gn->flags & FORCE) != 0;
}
#ifdef USE_META
Index: src/usr.bin/make/suff.c
diff -u src/usr.bin/make/suff.c:1.244 src/usr.bin/make/suff.c:1.245
--- src/usr.bin/make/suff.c:1.244 Mon Nov 16 21:39:22 2020
+++ src/usr.bin/make/suff.c Mon Nov 16 22:31:42 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: suff.c,v 1.244 2020/11/16 21:39:22 rillig Exp $ */
+/* $NetBSD: suff.c,v 1.245 2020/11/16 22:31:42 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -114,7 +114,7 @@
#include "dir.h"
/* "@(#)suff.c 8.4 (Berkeley) 3/21/94" */
-MAKE_RCSID("$NetBSD: suff.c,v 1.244 2020/11/16 21:39:22 rillig Exp $");
+MAKE_RCSID("$NetBSD: suff.c,v 1.245 2020/11/16 22:31:42 rillig Exp $");
#define SUFF_DEBUG0(text) DEBUG0(SUFF, text)
#define SUFF_DEBUG1(fmt, arg1) DEBUG1(SUFF, fmt, arg1)
@@ -1116,7 +1116,7 @@ SuffExpandChildren(GNodeListNode *cln, G
/*
* Break the result into a vector of strings whose nodes
* we can find, then add those nodes to the members list.
- * Unfortunately, we can't use brk_string because it
+ * Unfortunately, we can't use Str_Words because it
* doesn't understand about variable specifications with
* spaces in them...
*/
