Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

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



details:   https://anonhg.NetBSD.org/src/rev/1dfc996101a3
branches:  trunk
changeset: 977650:1dfc996101a3
user:      rillig <rillig%NetBSD.org@localhost>
date:      Fri Oct 30 15:39:17 2020 +0000

description:
make(1): fix indentation in source code

diffstat:

 usr.bin/make/dir.c   |   6 +++---
 usr.bin/make/job.c   |   6 +++---
 usr.bin/make/main.c  |   6 +++---
 usr.bin/make/make.c  |  18 +++++++++---------
 usr.bin/make/meta.c  |  10 +++++-----
 usr.bin/make/parse.c |  10 +++++-----
 usr.bin/make/suff.c  |  20 ++++++++++----------
 usr.bin/make/var.c   |  30 +++++++++++++++---------------
 8 files changed, 53 insertions(+), 53 deletions(-)

diffs (truncated from 407 to 300 lines):

diff -r 5a415b24a9dd -r 1dfc996101a3 usr.bin/make/dir.c
--- a/usr.bin/make/dir.c        Fri Oct 30 15:30:43 2020 +0000
+++ b/usr.bin/make/dir.c        Fri Oct 30 15:39:17 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dir.c,v 1.191 2020/10/27 06:55:18 rillig Exp $ */
+/*     $NetBSD: dir.c,v 1.192 2020/10/30 15:39:17 rillig Exp $ */
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -134,7 +134,7 @@
 #include "job.h"
 
 /*     "@(#)dir.c      8.2 (Berkeley) 1/2/94"  */
-MAKE_RCSID("$NetBSD: dir.c,v 1.191 2020/10/27 06:55:18 rillig Exp $");
+MAKE_RCSID("$NetBSD: dir.c,v 1.192 2020/10/30 15:39:17 rillig Exp $");
 
 #define DIR_DEBUG0(text) DEBUG0(DIR, text)
 #define DIR_DEBUG1(fmt, arg1) DEBUG1(DIR, fmt, arg1)
@@ -1453,7 +1453,7 @@
     for (ln = dirSearchPath->first; ln != NULL; ln = ln->next) {
        CachedDir *dir = ln->datum;
        dir->refCount++;
-        Lst_Append(path, dir);
+       Lst_Append(path, dir);
     }
     return path;
 }
diff -r 5a415b24a9dd -r 1dfc996101a3 usr.bin/make/job.c
--- a/usr.bin/make/job.c        Fri Oct 30 15:30:43 2020 +0000
+++ b/usr.bin/make/job.c        Fri Oct 30 15:39:17 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: job.c,v 1.294 2020/10/30 07:19:30 rillig Exp $ */
+/*     $NetBSD: job.c,v 1.295 2020/10/30 15:39:17 rillig Exp $ */
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -143,7 +143,7 @@
 #include "trace.h"
 
 /*     "@(#)job.c      8.2 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: job.c,v 1.294 2020/10/30 07:19:30 rillig Exp $");
+MAKE_RCSID("$NetBSD: job.c,v 1.295 2020/10/30 15:39:17 rillig Exp $");
 
 /* A shell defines how the commands are run.  All commands for a target are
  * written into a single file, which is then given to the shell to execute
@@ -877,7 +877,7 @@
     StringListNode *ln;
 
     for (ln = job->node->commands->first; ln != NULL; ln = ln->next) {
-        const char *cmd = ln->datum;
+       const char *cmd = ln->datum;
 
        if (strcmp(cmd, "...") == 0) {
            job->node->type |= OP_SAVE_CMDS;
diff -r 5a415b24a9dd -r 1dfc996101a3 usr.bin/make/main.c
--- a/usr.bin/make/main.c       Fri Oct 30 15:30:43 2020 +0000
+++ b/usr.bin/make/main.c       Fri Oct 30 15:39:17 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.410 2020/10/30 07:19:30 rillig Exp $        */
+/*     $NetBSD: main.c,v 1.411 2020/10/30 15:39:17 rillig Exp $        */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -118,7 +118,7 @@
 #include "trace.h"
 
 /*     "@(#)main.c     8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: main.c,v 1.410 2020/10/30 07:19:30 rillig Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.411 2020/10/30 15:39:17 rillig Exp $");
 #if defined(MAKE_NATIVE) && !defined(lint)
 __COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 "
            "The Regents of the University of California.  "
@@ -2097,7 +2097,7 @@
     if (en)
        return;                         /* we've been here! */
     if (gn)
-        SetErrorVars(gn);
+       SetErrorVars(gn);
     expr = "${MAKE_PRINT_VAR_ON_ERROR:@v@$v='${$v}'\n@}";
     (void)Var_Subst(expr, VAR_GLOBAL, VARE_WANTRES, &cp);
     /* TODO: handle errors */
diff -r 5a415b24a9dd -r 1dfc996101a3 usr.bin/make/make.c
--- a/usr.bin/make/make.c       Fri Oct 30 15:30:43 2020 +0000
+++ b/usr.bin/make/make.c       Fri Oct 30 15:39:17 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: make.c,v 1.181 2020/10/26 21:34:10 rillig Exp $        */
+/*     $NetBSD: make.c,v 1.182 2020/10/30 15:39:17 rillig Exp $        */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -107,7 +107,7 @@
 #include    "job.h"
 
 /*     "@(#)make.c     8.1 (Berkeley) 6/6/93"  */
-MAKE_RCSID("$NetBSD: make.c,v 1.181 2020/10/26 21:34:10 rillig Exp $");
+MAKE_RCSID("$NetBSD: make.c,v 1.182 2020/10/30 15:39:17 rillig Exp $");
 
 /* Sequence # to detect recursion. */
 static unsigned int checked = 1;
@@ -615,7 +615,7 @@
     checked++;
 
     {
-        char *cname_freeIt;
+       char *cname_freeIt;
        cname = Var_Value(TARGET, cgn, &cname_freeIt);
        assert(cname_freeIt == NULL);
     }
@@ -845,7 +845,7 @@
 
     UnmarkChildren(gn);
     for (ln = gn->children->first; ln != NULL; ln = ln->next)
-        MakeAddAllSrc(ln->datum, gn);
+       MakeAddAllSrc(ln->datum, gn);
 
     if (!Var_Exists(OODATE, gn)) {
        Var_Set(OODATE, "", gn);
@@ -1029,7 +1029,7 @@
 {
     GNodeListNode *ln;
     for (ln = gn->order_pred->first; ln != NULL; ln = ln->next)
-        MakePrintStatusOrderNode(ln->datum, gn);
+       MakePrintStatusOrderNode(ln->datum, gn);
 }
 
 static void MakePrintStatusList(GNodeList *, int *);
@@ -1111,7 +1111,7 @@
 {
     GNodeListNode *ln;
     for (ln = gnodes->first; ln != NULL; ln = ln->next)
-        if (MakePrintStatus(ln->datum, errors))
+       if (MakePrintStatus(ln->datum, errors))
            break;
 }
 
@@ -1126,9 +1126,9 @@
     GNodeList *examine;                /* List of targets to examine */
 
     {
-        /* XXX: Why is it necessary to copy the list? There shouldn't be
-         * any modifications to the list, at least the function name
-         * ExpandUse doesn't suggest that. */
+       /* XXX: Why is it necessary to copy the list? There shouldn't be
+        * any modifications to the list, at least the function name
+        * ExpandUse doesn't suggest that. */
        GNodeListNode *ln;
        examine = Lst_New();
        for (ln = targs->first; ln != NULL; ln = ln->next)
diff -r 5a415b24a9dd -r 1dfc996101a3 usr.bin/make/meta.c
--- a/usr.bin/make/meta.c       Fri Oct 30 15:30:43 2020 +0000
+++ b/usr.bin/make/meta.c       Fri Oct 30 15:39:17 2020 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: meta.c,v 1.131 2020/10/25 21:51:49 rillig Exp $ */
+/*      $NetBSD: meta.c,v 1.132 2020/10/30 15:39:17 rillig Exp $ */
 
 /*
  * Implement 'meta' mode.
@@ -175,7 +175,7 @@
        warn("Could not rewind filemon");
        fprintf(mfp, "\n");
     } else {
-        ssize_t n;
+       ssize_t n;
 
        error = 0;
        fprintf(mfp, "\n-- filemon acquired metadata --\n");
@@ -1059,7 +1059,7 @@
     StringListNode *ln;
 
     for (ln = list->first; ln != NULL; ln = ln->next)
-        if (strcmp(ln->datum, str) == 0)
+       if (strcmp(ln->datum, str) == 0)
            return;
     Lst_Append(list, bmake_strdup(str));
 }
@@ -1323,8 +1323,8 @@
                        while (ln != NULL) {
                            StringListNode *next = ln->next;
                            if (path_starts_with(ln->datum, p)) {
-                               free(ln->datum);
-                               Lst_Remove(missingFiles, ln);
+                               free(ln->datum);
+                               Lst_Remove(missingFiles, ln);
                            }
                            ln = next;
                        }
diff -r 5a415b24a9dd -r 1dfc996101a3 usr.bin/make/parse.c
--- a/usr.bin/make/parse.c      Fri Oct 30 15:30:43 2020 +0000
+++ b/usr.bin/make/parse.c      Fri Oct 30 15:39:17 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: parse.c,v 1.411 2020/10/30 07:19:30 rillig Exp $       */
+/*     $NetBSD: parse.c,v 1.412 2020/10/30 15:39:17 rillig Exp $       */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -117,7 +117,7 @@
 #include "pathnames.h"
 
 /*     "@(#)parse.c    8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: parse.c,v 1.411 2020/10/30 07:19:30 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.412 2020/10/30 15:39:17 rillig Exp $");
 
 /* types and constants */
 
@@ -1985,9 +1985,9 @@
     if (op == VAR_APPEND) {
        Var_Append(name, uvalue, ctxt);
     } else if (op == VAR_SUBST) {
-        VarAssign_EvalSubst(name, uvalue, ctxt, &avalue, &avalue_freeIt);
+       VarAssign_EvalSubst(name, uvalue, ctxt, &avalue, &avalue_freeIt);
     } else if (op == VAR_SHELL) {
-        VarAssign_EvalShell(name, uvalue, ctxt, &avalue, &avalue_freeIt);
+       VarAssign_EvalShell(name, uvalue, ctxt, &avalue, &avalue_freeIt);
     } else {
        if (op == VAR_DEFAULT && Var_Exists(name, ctxt)) {
            *out_avalue_freeIt = NULL;
@@ -2989,7 +2989,7 @@
      * Attempt to avoid ';' inside substitution patterns.
      */
     {
-        char *semicolon = FindSemicolon(line);
+       char *semicolon = FindSemicolon(line);
        if (*semicolon != '\0') {
            /* Terminate the dependency list at the ';' */
            *semicolon = '\0';
diff -r 5a415b24a9dd -r 1dfc996101a3 usr.bin/make/suff.c
--- a/usr.bin/make/suff.c       Fri Oct 30 15:30:43 2020 +0000
+++ b/usr.bin/make/suff.c       Fri Oct 30 15:39:17 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: suff.c,v 1.227 2020/10/26 20:14:27 rillig Exp $        */
+/*     $NetBSD: suff.c,v 1.228 2020/10/30 15:39:17 rillig Exp $        */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -129,7 +129,7 @@
 #include "dir.h"
 
 /*     "@(#)suff.c     8.4 (Berkeley) 3/21/94" */
-MAKE_RCSID("$NetBSD: suff.c,v 1.227 2020/10/26 20:14:27 rillig Exp $");
+MAKE_RCSID("$NetBSD: suff.c,v 1.228 2020/10/30 15:39:17 rillig Exp $");
 
 #define SUFF_DEBUG0(text) DEBUG0(SUFF, text)
 #define SUFF_DEBUG1(fmt, arg1) DEBUG1(SUFF, fmt, arg1)
@@ -295,9 +295,9 @@
 {
     GNodeListNode *ln;
     for (ln = transforms->first; ln != NULL; ln = ln->next) {
-        GNode *gn = ln->datum;
-        if (strcmp(gn->name, name) == 0)
-            return gn;
+       GNode *gn = ln->datum;
+       if (strcmp(gn->name, name) == 0)
+           return gn;
     }
     return NULL;
 }
@@ -1334,7 +1334,7 @@
     Suff *suff = gn->suffix;
 
     if (suff == NULL) {
-        char *name = gn->name;
+       char *name = gn->name;
        size_t nameLen = strlen(gn->name);
        SuffListNode *ln;
        for (ln = sufflist->first; ln != NULL; ln = ln->next)
@@ -1351,7 +1351,7 @@
        SUFF_DEBUG1("suffix is \"%s\"...\n", suff->name);
        return suff->searchPath;
     } else {
-        SUFF_DEBUG0("\n");
+       SUFF_DEBUG0("\n");
        return dirSearchPath;   /* Use default search path */
     }
 }
@@ -1615,7 +1615,7 @@
     Src *targ;
 
     if (!Lst_IsEmpty(targs) || suffNull == NULL)
-        return;
+       return;
 
     SUFF_DEBUG1("\tNo known suffix on %s. Using .NULL suffix\n", gn->name);
 
@@ -1650,14 +1650,14 @@
 SuffFindNormalDepsPath(GNode *gn, Src *targ)
 {
     if (gn->type & (OP_PHONY | OP_NOPATH))
-        return;
+       return;
 
     free(gn->path);
     gn->path = Dir_FindFile(gn->name,
                            (targ == NULL ? dirSearchPath :
                             targ->suff->searchPath));
     if (gn->path == NULL)
-        return;
+       return;
 
     Var_Set(TARGET, gn->path, gn);
 



Home | Main Index | Thread Index | Old Index