[src/trunk]: src/usr.bin/make make(1): fix inconsistent code indentation

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/usr.bin/make make(1): fix inconsistent code indentation
From: rillig <rillig%NetBSD.org@localhost>
Date: Sun, 15 Nov 2020 15:07:31 +0000
details:   https://anonhg.NetBSD.org/src/rev/692703349261
branches:  trunk
changeset: 943860:692703349261
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sat Sep 12 14:41:00 2020 +0000

description:
make(1): fix inconsistent code indentation

diffstat:

 usr.bin/make/compat.c |   8 ++++----
 usr.bin/make/cond.c   |  12 ++++++------
 usr.bin/make/enum.c   |   8 ++++----
 usr.bin/make/enum.h   |  20 ++++++++++----------
 usr.bin/make/for.c    |   8 ++++----
 usr.bin/make/lst.c    |   8 ++++----
 usr.bin/make/meta.c   |   4 ++--
 usr.bin/make/parse.c  |  10 +++++-----
 usr.bin/make/suff.c   |  14 +++++++-------
 usr.bin/make/var.c    |  20 ++++++++++----------
 10 files changed, 56 insertions(+), 56 deletions(-)

diffs (truncated from 436 to 300 lines):

diff -r 75f74ac13a04 -r 692703349261 usr.bin/make/compat.c
--- a/usr.bin/make/compat.c     Sat Sep 12 12:39:28 2020 +0000
+++ b/usr.bin/make/compat.c     Sat Sep 12 14:41:00 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: compat.c,v 1.140 2020/09/11 17:32:36 rillig Exp $      */
+/*     $NetBSD: compat.c,v 1.141 2020/09/12 14:41:00 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.140 2020/09/11 17:32:36 rillig Exp $";
+static char rcsid[] = "$NetBSD: compat.c,v 1.141 2020/09/12 14:41:00 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.140 2020/09/11 17:32:36 rillig Exp $");
+__RCSID("$NetBSD: compat.c,v 1.141 2020/09/12 14:41:00 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -238,7 +238,7 @@
     LstNode_Set(cmdNode, cmdStart);
 
     if ((gn->type & OP_SAVE_CMDS) && (gn != ENDNode)) {
-        assert(ENDNode != NULL);
+       assert(ENDNode != NULL);
        Lst_Append(ENDNode->commands, cmdStart);
        return 0;
     }
diff -r 75f74ac13a04 -r 692703349261 usr.bin/make/cond.c
--- a/usr.bin/make/cond.c       Sat Sep 12 12:39:28 2020 +0000
+++ b/usr.bin/make/cond.c       Sat Sep 12 14:41:00 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cond.c,v 1.136 2020/09/12 10:41:43 rillig Exp $        */
+/*     $NetBSD: cond.c,v 1.137 2020/09/12 14:41:00 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.136 2020/09/12 10:41:43 rillig Exp $";
+static char rcsid[] = "$NetBSD: cond.c,v 1.137 2020/09/12 14:41:00 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.136 2020/09/12 10:41:43 rillig Exp $");
+__RCSID("$NetBSD: cond.c,v 1.137 2020/09/12 14:41:00 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -654,7 +654,7 @@
        }
        break;
     default:
-        t = doEval ? EvalNotEmpty(par, lhs, lhsQuoted) : TOK_FALSE;
+       t = doEval ? EvalNotEmpty(par, lhs, lhsQuoted) : TOK_FALSE;
        goto done;
     }
 
@@ -991,10 +991,10 @@
 
     res = CondParser_Expr(par, TRUE);
     if (res != TOK_FALSE && res != TOK_TRUE)
-        return COND_INVALID;
+       return COND_INVALID;
 
     if (CondParser_Token(par, TRUE /* XXX: Why TRUE? */) != TOK_EOF)
-        return COND_INVALID;
+       return COND_INVALID;
 
     *value = res == TOK_TRUE;
     return COND_PARSE;
diff -r 75f74ac13a04 -r 692703349261 usr.bin/make/enum.c
--- a/usr.bin/make/enum.c       Sat Sep 12 12:39:28 2020 +0000
+++ b/usr.bin/make/enum.c       Sat Sep 12 14:41:00 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: enum.c,v 1.6 2020/09/01 20:34:51 rillig Exp $  */
+/*     $NetBSD: enum.c,v 1.7 2020/09/12 14:41:00 rillig Exp $  */
 
 /*
  Copyright (c) 2020 Roland Illig <rillig%NetBSD.org@localhost>
@@ -28,11 +28,11 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: enum.c,v 1.6 2020/09/01 20:34:51 rillig Exp $";
+static char rcsid[] = "$NetBSD: enum.c,v 1.7 2020/09/12 14:41:00 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: enum.c,v 1.6 2020/09/01 20:34:51 rillig Exp $");
+__RCSID("$NetBSD: enum.c,v 1.7 2020/09/12 14:41:00 rillig Exp $");
 #endif
 #endif
 
@@ -94,7 +94,7 @@
 {
        for (; spec->es_name[0] != '\0'; spec++) {
            if (value == spec->es_value)
-               return spec->es_name;
+               return spec->es_name;
        }
        abort(/* unknown enum value */);
 }
diff -r 75f74ac13a04 -r 692703349261 usr.bin/make/enum.h
--- a/usr.bin/make/enum.h       Sat Sep 12 12:39:28 2020 +0000
+++ b/usr.bin/make/enum.h       Sat Sep 12 14:41:00 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: enum.h,v 1.9 2020/09/01 20:34:51 rillig Exp $  */
+/*     $NetBSD: enum.h,v 1.10 2020/09/12 14:41:00 rillig Exp $ */
 
 /*
  Copyright (c) 2020 Roland Illig <rillig%NetBSD.org@localhost>
@@ -112,11 +112,11 @@
 #define ENUM_FLAGS_RTTI_3(typnam, v1, v2, v3) \
        ENUM__FLAGS_RTTI(typnam, \
            ENUM__SPECS_2( \
-               ENUM__SPEC_2(v1, v2), \
-               ENUM__SPEC_1(v3)), \
+               ENUM__SPEC_2(v1, v2), \
+               ENUM__SPEC_1(v3)), \
            ENUM__JOIN_2( \
-               ENUM__JOIN_STR_2(v1, v2), \
-               ENUM__JOIN_STR_1(v3)))
+               ENUM__JOIN_STR_2(v1, v2), \
+               ENUM__JOIN_STR_1(v3)))
 
 /* Declare the necessary data structures for calling Enum_FlagsToString
  * for an enum with 8 flags. */
@@ -156,8 +156,8 @@
                     v17, v18, v19, v20, v21, v22, v23, v24, \
                     v25, v26, v27, v28, v29, v30, v31) \
     ENUM__FLAGS_RTTI(typnam, \
-        ENUM__SPECS_5( \
-            ENUM__SPEC_16(v01, v02, v03, v04, v05, v06, v07, v08, \
+       ENUM__SPECS_5( \
+           ENUM__SPEC_16(v01, v02, v03, v04, v05, v06, v07, v08, \
                          v09, v10, v11, v12, v13, v14, v15, v16), \
            ENUM__SPEC_8(v17, v18, v19, v20, v21, v22, v23, v24), \
            ENUM__SPEC_4(v25, v26, v27, v28), \
@@ -179,8 +179,8 @@
                     v17, v18, v19, v20, v21, v22, v23, v24, \
                     v25, v26, v27, v28, v29, v30, v31, v32) \
     ENUM__FLAGS_RTTI(typnam, \
-        ENUM__SPECS_2( \
-            ENUM__SPEC_16(v01, v02, v03, v04, v05, v06, v07, v08, \
+       ENUM__SPECS_2( \
+           ENUM__SPEC_16(v01, v02, v03, v04, v05, v06, v07, v08, \
                          v09, v10, v11, v12, v13, v14, v15, v16), \
            ENUM__SPEC_16(v17, v18, v19, v20, v21, v22, v23, v24, \
                          v25, v26, v27, v28, v29, v30, v31, v32)), \
@@ -188,6 +188,6 @@
            ENUM__JOIN_STR_16(v01, v02, v03, v04, v05, v06, v07, v08, \
                              v09, v10, v11, v12, v13, v14, v15, v16), \
            ENUM__JOIN_STR_16(v17, v18, v19, v20, v21, v22, v23, v24, \
-                             v25, v26, v27, v28, v29, v30, v31, v32)))
+                             v25, v26, v27, v28, v29, v30, v31, v32)))
 
 #endif
diff -r 75f74ac13a04 -r 692703349261 usr.bin/make/for.c
--- a/usr.bin/make/for.c        Sat Sep 12 12:39:28 2020 +0000
+++ b/usr.bin/make/for.c        Sat Sep 12 14:41:00 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: for.c,v 1.81 2020/09/12 10:14:16 rillig Exp $  */
+/*     $NetBSD: for.c,v 1.82 2020/09/12 14:41:00 rillig Exp $  */
 
 /*
  * Copyright (c) 1992, The Regents of the University of California.
@@ -30,14 +30,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: for.c,v 1.81 2020/09/12 10:14:16 rillig Exp $";
+static char rcsid[] = "$NetBSD: for.c,v 1.82 2020/09/12 14:41:00 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)for.c      8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: for.c,v 1.81 2020/09/12 10:14:16 rillig Exp $");
+__RCSID("$NetBSD: for.c,v 1.82 2020/09/12 14:41:00 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -243,7 +243,7 @@
     Words_Free(words);
 
     {
-        size_t len, n;
+       size_t len, n;
 
        if ((len = strlist_num(&new_for->items)) > 0 &&
            len % (n = strlist_num(&new_for->vars))) {
diff -r 75f74ac13a04 -r 692703349261 usr.bin/make/lst.c
--- a/usr.bin/make/lst.c        Sat Sep 12 12:39:28 2020 +0000
+++ b/usr.bin/make/lst.c        Sat Sep 12 14:41:00 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: lst.c,v 1.61 2020/09/04 17:59:36 rillig Exp $ */
+/* $NetBSD: lst.c,v 1.62 2020/09/12 14:41:00 rillig Exp $ */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -37,11 +37,11 @@
 #include "make.h"
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: lst.c,v 1.61 2020/09/04 17:59:36 rillig Exp $";
+static char rcsid[] = "$NetBSD: lst.c,v 1.62 2020/09/12 14:41:00 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: lst.c,v 1.61 2020/09/04 17:59:36 rillig Exp $");
+__RCSID("$NetBSD: lst.c,v 1.62 2020/09/12 14:41:00 rillig Exp $");
 #endif /* not lint */
 #endif
 
@@ -648,7 +648,7 @@
 void Stack_Push(Stack *stack, void *datum)
 {
     if (stack->len >= stack->cap) {
-        stack->cap *= 2;
+       stack->cap *= 2;
        stack->items = bmake_realloc(stack->items,
                                     stack->cap * sizeof stack->items[0]);
     }
diff -r 75f74ac13a04 -r 692703349261 usr.bin/make/meta.c
--- a/usr.bin/make/meta.c       Sat Sep 12 12:39:28 2020 +0000
+++ b/usr.bin/make/meta.c       Sat Sep 12 14:41:00 2020 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: meta.c,v 1.113 2020/09/02 04:08:54 rillig Exp $ */
+/*      $NetBSD: meta.c,v 1.114 2020/09/12 14:41:00 rillig Exp $ */
 
 /*
  * Implement 'meta' mode.
@@ -961,7 +961,7 @@
     size_t n = strlen(prefix);
 
     if (strncmp(path, prefix, n) != 0)
-        return FALSE;
+       return FALSE;
     return path[n] == '\0' || path[n] == '/';
 }
 
diff -r 75f74ac13a04 -r 692703349261 usr.bin/make/parse.c
--- a/usr.bin/make/parse.c      Sat Sep 12 12:39:28 2020 +0000
+++ b/usr.bin/make/parse.c      Sat Sep 12 14:41:00 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: parse.c,v 1.291 2020/09/12 11:21:15 rillig Exp $       */
+/*     $NetBSD: parse.c,v 1.292 2020/09/12 14:41:00 rillig Exp $       */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: parse.c,v 1.291 2020/09/12 11:21:15 rillig Exp $";
+static char rcsid[] = "$NetBSD: parse.c,v 1.292 2020/09/12 14:41:00 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.291 2020/09/12 11:21:15 rillig Exp $");
+__RCSID("$NetBSD: parse.c,v 1.292 2020/09/12 14:41:00 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -1206,7 +1206,7 @@
                free(freeIt);
                cp += nested_p - cp;
            } else
-               cp++;
+               cp++;
        }
 
        /*
@@ -2859,7 +2859,7 @@
 ParseFinishLine(void)
 {
     if (inLine) {
-        if (targets != NULL) {
+       if (targets != NULL) {
            Lst_ForEach(targets, Suff_EndTransform, NULL);
            Lst_Destroy(targets, ParseHasCommands);
        }
diff -r 75f74ac13a04 -r 692703349261 usr.bin/make/suff.c
Prev by Date: [src/trunk]: src/libexec/httpd bozohttpd: add .m4a and .m4v file extensions.
Next by Date: [src/trunk]: src/libexec/httpd bozohttpd: correct .m4a to audio/mp4.
Previous by Thread: [src/trunk]: src/libexec/httpd bozohttpd: add .m4a and .m4v file extensions.
Next by Thread: [src/trunk]: src/libexec/httpd bozohttpd: correct .m4a to audio/mp4.
Indexes:
Home | Main Index | Thread Index | Old Index