Module Name: src Committed By: rillig Date: Sat Sep 12 14:41:00 UTC 2020
Modified Files: src/usr.bin/make: compat.c cond.c enum.c enum.h for.c lst.c meta.c parse.c suff.c var.c Log Message: make(1): fix inconsistent code indentation To generate a diff of this commit: cvs rdiff -u -r1.140 -r1.141 src/usr.bin/make/compat.c cvs rdiff -u -r1.136 -r1.137 src/usr.bin/make/cond.c cvs rdiff -u -r1.6 -r1.7 src/usr.bin/make/enum.c cvs rdiff -u -r1.9 -r1.10 src/usr.bin/make/enum.h cvs rdiff -u -r1.81 -r1.82 src/usr.bin/make/for.c cvs rdiff -u -r1.61 -r1.62 src/usr.bin/make/lst.c cvs rdiff -u -r1.113 -r1.114 src/usr.bin/make/meta.c cvs rdiff -u -r1.291 -r1.292 src/usr.bin/make/parse.c cvs rdiff -u -r1.147 -r1.148 src/usr.bin/make/suff.c cvs rdiff -u -r1.493 -r1.494 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.140 src/usr.bin/make/compat.c:1.141 --- src/usr.bin/make/compat.c:1.140 Fri Sep 11 17:32:36 2020 +++ src/usr.bin/make/compat.c Sat Sep 12 14:41:00 2020 @@ -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 @@ CompatRunCommand(void *cmdp, void *gnp) 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; } Index: src/usr.bin/make/cond.c diff -u src/usr.bin/make/cond.c:1.136 src/usr.bin/make/cond.c:1.137 --- src/usr.bin/make/cond.c:1.136 Sat Sep 12 10:41:43 2020 +++ src/usr.bin/make/cond.c Sat Sep 12 14:41:00 2020 @@ -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 @@ CondParser_Comparison(CondParser *par, B } break; default: - t = doEval ? EvalNotEmpty(par, lhs, lhsQuoted) : TOK_FALSE; + t = doEval ? EvalNotEmpty(par, lhs, lhsQuoted) : TOK_FALSE; goto done; } @@ -991,10 +991,10 @@ CondParser_Eval(CondParser *par, Boolean 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; Index: src/usr.bin/make/enum.c diff -u src/usr.bin/make/enum.c:1.6 src/usr.bin/make/enum.c:1.7 --- src/usr.bin/make/enum.c:1.6 Tue Sep 1 20:34:51 2020 +++ src/usr.bin/make/enum.c Sat Sep 12 14:41:00 2020 @@ -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 <ril...@netbsd.org> @@ -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 @@ Enum_ValueToString(int value, const Enum { for (; spec->es_name[0] != '\0'; spec++) { if (value == spec->es_value) - return spec->es_name; + return spec->es_name; } abort(/* unknown enum value */); } Index: src/usr.bin/make/enum.h diff -u src/usr.bin/make/enum.h:1.9 src/usr.bin/make/enum.h:1.10 --- src/usr.bin/make/enum.h:1.9 Tue Sep 1 20:34:51 2020 +++ src/usr.bin/make/enum.h Sat Sep 12 14:41:00 2020 @@ -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 <ril...@netbsd.org> @@ -112,11 +112,11 @@ const char *Enum_ValueToString(int, cons #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 @@ const char *Enum_ValueToString(int, cons 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 @@ const char *Enum_ValueToString(int, cons 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 @@ const char *Enum_ValueToString(int, cons 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 Index: src/usr.bin/make/for.c diff -u src/usr.bin/make/for.c:1.81 src/usr.bin/make/for.c:1.82 --- src/usr.bin/make/for.c:1.81 Sat Sep 12 10:14:16 2020 +++ src/usr.bin/make/for.c Sat Sep 12 14:41:00 2020 @@ -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 @@ For_Eval(const char *line) 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))) { Index: src/usr.bin/make/lst.c diff -u src/usr.bin/make/lst.c:1.61 src/usr.bin/make/lst.c:1.62 --- src/usr.bin/make/lst.c:1.61 Fri Sep 4 17:59:36 2020 +++ src/usr.bin/make/lst.c Sat Sep 12 14:41:00 2020 @@ -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 @@ Boolean Stack_IsEmpty(Stack *stack) 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]); } Index: src/usr.bin/make/meta.c diff -u src/usr.bin/make/meta.c:1.113 src/usr.bin/make/meta.c:1.114 --- src/usr.bin/make/meta.c:1.113 Wed Sep 2 04:08:54 2020 +++ src/usr.bin/make/meta.c Sat Sep 12 14:41:00 2020 @@ -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 @@ path_match(const void *p, const void *q) size_t n = strlen(prefix); if (strncmp(path, prefix, n) != 0) - return FALSE; + return FALSE; return path[n] == '\0' || path[n] == '/'; } Index: src/usr.bin/make/parse.c diff -u src/usr.bin/make/parse.c:1.291 src/usr.bin/make/parse.c:1.292 --- src/usr.bin/make/parse.c:1.291 Sat Sep 12 11:21:15 2020 +++ src/usr.bin/make/parse.c Sat Sep 12 14:41:00 2020 @@ -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 @@ ParseDoDependency(char *line) free(freeIt); cp += nested_p - cp; } else - cp++; + cp++; } /* @@ -2859,7 +2859,7 @@ static void ParseFinishLine(void) { if (inLine) { - if (targets != NULL) { + if (targets != NULL) { Lst_ForEach(targets, Suff_EndTransform, NULL); Lst_Destroy(targets, ParseHasCommands); } Index: src/usr.bin/make/suff.c diff -u src/usr.bin/make/suff.c:1.147 src/usr.bin/make/suff.c:1.148 --- src/usr.bin/make/suff.c:1.147 Fri Sep 11 04:36:12 2020 +++ src/usr.bin/make/suff.c Sat Sep 12 14:41:00 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: suff.c,v 1.147 2020/09/11 04:36:12 rillig Exp $ */ +/* $NetBSD: suff.c,v 1.148 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: suff.c,v 1.147 2020/09/11 04:36:12 rillig Exp $"; +static char rcsid[] = "$NetBSD: suff.c,v 1.148 2020/09/12 14:41:00 rillig Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)suff.c 8.4 (Berkeley) 3/21/94"; #else -__RCSID("$NetBSD: suff.c,v 1.147 2020/09/11 04:36:12 rillig Exp $"); +__RCSID("$NetBSD: suff.c,v 1.148 2020/09/12 14:41:00 rillig Exp $"); #endif #endif /* not lint */ #endif @@ -664,7 +664,7 @@ Suff_EndTransform(void *gnp, void *dummy SuffRemove(p, t); } } else if (gn->type & OP_TRANSFORM) { - SUFF_DEBUG1("transformation %s complete\n", gn->name); + SUFF_DEBUG1("transformation %s complete\n", gn->name); } return 0; @@ -814,7 +814,7 @@ Suff_AddSuffix(const char *name, GNode * ln = Lst_Find(sufflist, SuffSuffHasName, name); if (ln == NULL) { - s = SuffNew(name); + s = SuffNew(name); Lst_Append(sufflist, s); /* @@ -1332,7 +1332,7 @@ SuffExpandChildren(LstNode cln, GNode *p Parse_Error(PARSE_FATAL, "Malformed variable expression at \"%s\"", cp); - cp++; + cp++; } else { cp += nested_p - cp; } @@ -1777,7 +1777,7 @@ SuffFindNormalDeps(GNode *gn, Lst slst) ln = Lst_FindFrom(sufflist, ln, SuffSuffIsSuffix, &sd); if (ln != NULL) { - const char *eopref; + const char *eopref; /* * Allocate a Src structure to which things can be transformed Index: src/usr.bin/make/var.c diff -u src/usr.bin/make/var.c:1.493 src/usr.bin/make/var.c:1.494 --- src/usr.bin/make/var.c:1.493 Fri Sep 11 17:32:36 2020 +++ src/usr.bin/make/var.c Sat Sep 12 14:41:00 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: var.c,v 1.493 2020/09/11 17:32:36 rillig Exp $ */ +/* $NetBSD: var.c,v 1.494 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: var.c,v 1.493 2020/09/11 17:32:36 rillig Exp $"; +static char rcsid[] = "$NetBSD: var.c,v 1.494 2020/09/12 14:41:00 rillig Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)var.c 8.3 (Berkeley) 3/19/94"; #else -__RCSID("$NetBSD: var.c,v 1.493 2020/09/11 17:32:36 rillig Exp $"); +__RCSID("$NetBSD: var.c,v 1.494 2020/09/12 14:41:00 rillig Exp $"); #endif #endif /* not lint */ #endif @@ -596,7 +596,7 @@ Var_ExportVars(void) val = Var_Subst("${" MAKE_EXPORTED ":O:u}", VAR_GLOBAL, VARE_WANTRES); if (*val) { - Words words = Str_Words(val, FALSE); + Words words = Str_Words(val, FALSE); size_t i; for (i = 0; i < words.len; i++) @@ -637,7 +637,7 @@ Var_Export(const char *str, Boolean isEx val = Var_Subst(str, VAR_GLOBAL, VARE_WANTRES); if (val[0] != '\0') { - Words words = Str_Words(val, FALSE); + Words words = Str_Words(val, FALSE); size_t i; for (i = 0; i < words.len; i++) { @@ -2016,7 +2016,7 @@ ApplyModifier_Defined(const char **pp, A p = *pp + 1; while (*p != st->endc && *p != ':' && *p != '\0') { - /* Escaped delimiter or other special character */ + /* Escaped delimiter or other special character */ if (*p == '\\') { char c = p[1]; if (c == st->endc || c == ':' || c == '$' || c == '\\') { @@ -2192,9 +2192,9 @@ ApplyModifier_Range(const char **pp, App } if (n == 0) { - Words words = Str_Words(st->val, FALSE); - n = words.len; - Words_Free(words); + Words words = Str_Words(st->val, FALSE); + n = words.len; + Words_Free(words); } Buf_Init(&buf, 0); @@ -2585,7 +2585,7 @@ ApplyModifier_Words(const char **pp, App Words words = Str_Words(st->val, FALSE); size_t ac = words.len; Words_Free(words); - + Buf_Init(&buf, 4); /* 3 digits + '\0' is usually enough */ Buf_AddInt(&buf, (int)ac); st->newVal = Buf_Destroy(&buf, FALSE);