[src/trunk]: src/usr.bin/make make: amend leftover cleanups from the previous...

[rillig <rillig%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e3e9db3eeb0f
branches:  trunk
changeset: 1027686:e3e9db3eeb0f
user:      rillig <rillig%NetBSD.org@localhost>
date:      Wed Dec 15 13:03:33 2021 +0000

description:
make: amend leftover cleanups from the previous commits

No functional change.

diffstat:

 usr.bin/make/compat.c |  12 ++++++------
 usr.bin/make/make.h   |  10 +++++-----
 usr.bin/make/var.c    |   8 ++++----
 3 files changed, 15 insertions(+), 15 deletions(-)

diffs (109 lines):

diff -r e79b07f2184b -r e3e9db3eeb0f usr.bin/make/compat.c
--- a/usr.bin/make/compat.c     Wed Dec 15 12:58:01 2021 +0000
+++ b/usr.bin/make/compat.c     Wed Dec 15 13:03:33 2021 +0000
@@ -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 @@
 {
        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 @@
        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;
diff -r e79b07f2184b -r e3e9db3eeb0f usr.bin/make/make.h
--- a/usr.bin/make/make.h       Wed Dec 15 12:58:01 2021 +0000
+++ b/usr.bin/make/make.h       Wed Dec 15 13:03:33 2021 +0000
@@ -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
diff -r e79b07f2184b -r e3e9db3eeb0f usr.bin/make/var.c
--- a/usr.bin/make/var.c        Wed Dec 15 12:58:01 2021 +0000
+++ b/usr.bin/make/var.c        Wed Dec 15 13:03:33 2021 +0000
@@ -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 @@
 };
 
 #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}. */