Module Name: src
Committed By: rillig
Date: Wed Dec 15 13:03:33 UTC 2021
Modified Files:
src/usr.bin/make: compat.c make.h var.c
Log Message:
make: amend leftover cleanups from the previous commits
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.232 -r1.233 src/usr.bin/make/compat.c
cvs rdiff -u -r1.277 -r1.278 src/usr.bin/make/make.h
cvs rdiff -u -r1.988 -r1.989 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/compat.c
diff -u src/usr.bin/make/compat.c:1.232 src/usr.bin/make/compat.c:1.233
--- src/usr.bin/make/compat.c:1.232 Wed Dec 15 12:58:01 2021
+++ src/usr.bin/make/compat.c Wed Dec 15 13:03:33 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: compat.c,v 1.232 2021/12/15 12:58:01 rillig Exp $ */
+/* $NetBSD: compat.c,v 1.233 2021/12/15 13:03:33 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.232 2021/12/15 12:58:01 rillig Exp $");
+MAKE_RCSID("$NetBSD: compat.c,v 1.233 2021/12/15 13:03:33 rillig Exp $");
static GNode *curTarg = NULL;
static pid_t compatChild;
@@ -165,7 +165,7 @@ DebugFailedTarget(const char *cmd, const
{
const char *p = cmd;
debug_printf("\n*** Failed target: %s\n*** Failed command: ",
- gn->name);
+ gn->name);
/*
* Replace runs of whitespace with a single space, to reduce the
@@ -228,15 +228,15 @@ Compat_RunCommand(const char *cmdp, GNod
char *bp;
bool silent; /* Don't print command */
bool doIt; /* Execute even if -n */
- volatile bool errCheck; /* Check errors */
+ volatile bool errCheck; /* Check errors */
int reason; /* Reason for child's death */
int status; /* Description of child's death */
pid_t cpid; /* Child actually found */
pid_t retstat; /* Result of wait */
const char **volatile av; /* Argument vector for thing to exec */
char **volatile mav; /* Copy of the argument vector for freeing */
- bool useShell; /* True if command should be executed
- * using a shell */
+ bool useShell; /* True if command should be executed using a
+ * shell */
const char *volatile cmd = cmdp;
silent = (gn->type & OP_SILENT) != OP_NONE;
Index: src/usr.bin/make/make.h
diff -u src/usr.bin/make/make.h:1.277 src/usr.bin/make/make.h:1.278
--- src/usr.bin/make/make.h:1.277 Wed Dec 15 12:58:01 2021
+++ src/usr.bin/make/make.h Wed Dec 15 13:03:33 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: make.h,v 1.277 2021/12/15 12:58:01 rillig Exp $ */
+/* $NetBSD: make.h,v 1.278 2021/12/15 13:03:33 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -105,9 +105,9 @@
#define MAKE_GNUC_PREREQ(x, y) \
((__GNUC__ == (x) && __GNUC_MINOR__ >= (y)) || \
(__GNUC__ > (x)))
-#else /* defined(__GNUC__) */
+#else
#define MAKE_GNUC_PREREQ(x, y) 0
-#endif /* defined(__GNUC__) */
+#endif
#if MAKE_GNUC_PREREQ(2, 7)
#define MAKE_ATTR_UNUSED __attribute__((__unused__))
@@ -131,9 +131,9 @@
#endif
#if MAKE_GNUC_PREREQ(4, 0)
-#define MAKE_ATTR_USE __attribute__((__warn_unused_result__))
+#define MAKE_ATTR_USE __attribute__((__warn_unused_result__))
#else
-#define MAKE_ATTR_USE /* delete */
+#define MAKE_ATTR_USE /* delete */
#endif
#define MAKE_INLINE static inline MAKE_ATTR_UNUSED
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.988 src/usr.bin/make/var.c:1.989
--- src/usr.bin/make/var.c:1.988 Wed Dec 15 12:58:01 2021
+++ src/usr.bin/make/var.c Wed Dec 15 13:03:33 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.988 2021/12/15 12:58:01 rillig Exp $ */
+/* $NetBSD: var.c,v 1.989 2021/12/15 13:03:33 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -140,7 +140,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.988 2021/12/15 12:58:01 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.989 2021/12/15 13:03:33 rillig Exp $");
/*
* Variables are defined using one of the VAR=value assignments. Their
@@ -2038,9 +2038,9 @@ static const char ExprDefined_Name[][10]
};
#if __STDC_VERSION__ >= 199901L
-#define const_member const
+#define const_member const
#else
-#define const_member /* no const possible */
+#define const_member /* no const possible */
#endif
/* An expression based on a variable, such as $@ or ${VAR:Mpattern:Q}. */
