Module Name: src
Committed By: rillig
Date: Fri Oct 30 15:39:17 UTC 2020
Modified Files:
src/usr.bin/make: dir.c job.c main.c make.c meta.c parse.c suff.c var.c
Log Message:
make(1): fix indentation in source code
To generate a diff of this commit:
cvs rdiff -u -r1.191 -r1.192 src/usr.bin/make/dir.c
cvs rdiff -u -r1.294 -r1.295 src/usr.bin/make/job.c
cvs rdiff -u -r1.410 -r1.411 src/usr.bin/make/main.c
cvs rdiff -u -r1.181 -r1.182 src/usr.bin/make/make.c
cvs rdiff -u -r1.131 -r1.132 src/usr.bin/make/meta.c
cvs rdiff -u -r1.411 -r1.412 src/usr.bin/make/parse.c
cvs rdiff -u -r1.227 -r1.228 src/usr.bin/make/suff.c
cvs rdiff -u -r1.598 -r1.599 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/dir.c
diff -u src/usr.bin/make/dir.c:1.191 src/usr.bin/make/dir.c:1.192
--- src/usr.bin/make/dir.c:1.191 Tue Oct 27 06:55:18 2020
+++ src/usr.bin/make/dir.c Fri Oct 30 15:39:17 2020
@@ -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 @@ Dir_CopyDirSearchPath(void)
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;
}
Index: src/usr.bin/make/job.c
diff -u src/usr.bin/make/job.c:1.294 src/usr.bin/make/job.c:1.295
--- src/usr.bin/make/job.c:1.294 Fri Oct 30 07:19:30 2020
+++ src/usr.bin/make/job.c Fri Oct 30 15:39:17 2020
@@ -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 @@ JobPrintCommands(Job *job)
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;
Index: src/usr.bin/make/main.c
diff -u src/usr.bin/make/main.c:1.410 src/usr.bin/make/main.c:1.411
--- src/usr.bin/make/main.c:1.410 Fri Oct 30 07:19:30 2020
+++ src/usr.bin/make/main.c Fri Oct 30 15:39:17 2020
@@ -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 @@ PrintOnError(GNode *gn, const char *s)
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 */
Index: src/usr.bin/make/make.c
diff -u src/usr.bin/make/make.c:1.181 src/usr.bin/make/make.c:1.182
--- src/usr.bin/make/make.c:1.181 Mon Oct 26 21:34:10 2020
+++ src/usr.bin/make/make.c Fri Oct 30 15:39:17 2020
@@ -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 @@ Make_Update(GNode *cgn)
checked++;
{
- char *cname_freeIt;
+ char *cname_freeIt;
cname = Var_Value(TARGET, cgn, &cname_freeIt);
assert(cname_freeIt == NULL);
}
@@ -845,7 +845,7 @@ Make_DoAllVar(GNode *gn)
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 @@ MakePrintStatusOrder(GNode *gn)
{
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 @@ MakePrintStatusList(GNodeList *gnodes, i
{
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 @@ Make_ExpandUse(GNodeList *targs)
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)
Index: src/usr.bin/make/meta.c
diff -u src/usr.bin/make/meta.c:1.131 src/usr.bin/make/meta.c:1.132
--- src/usr.bin/make/meta.c:1.131 Sun Oct 25 21:51:49 2020
+++ src/usr.bin/make/meta.c Fri Oct 30 15:39:17 2020
@@ -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 @@ filemon_read(FILE *mfp, int fd)
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 @@ append_if_new(StringList *list, const ch
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 @@ meta_oodate(GNode *gn, Boolean oodate)
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;
}
Index: src/usr.bin/make/parse.c
diff -u src/usr.bin/make/parse.c:1.411 src/usr.bin/make/parse.c:1.412
--- src/usr.bin/make/parse.c:1.411 Fri Oct 30 07:19:30 2020
+++ src/usr.bin/make/parse.c Fri Oct 30 15:39:17 2020
@@ -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 @@ VarAssign_Eval(const char *name, VarAssi
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 @@ ParseDependency(char *line)
* 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';
Index: src/usr.bin/make/suff.c
diff -u src/usr.bin/make/suff.c:1.227 src/usr.bin/make/suff.c:1.228
--- src/usr.bin/make/suff.c:1.227 Mon Oct 26 20:14:27 2020
+++ src/usr.bin/make/suff.c Fri Oct 30 15:39:17 2020
@@ -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 @@ FindTransformByName(const char *name)
{
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_FindPath(GNode* gn)
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_FindPath(GNode* gn)
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 @@ SuffFindNormalDepsUnknown(GNode *gn, con
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 @@ static void
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);
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.598 src/usr.bin/make/var.c:1.599
--- src/usr.bin/make/var.c:1.598 Fri Oct 30 15:28:38 2020
+++ src/usr.bin/make/var.c Fri Oct 30 15:39:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.598 2020/10/30 15:28:38 rillig Exp $ */
+/* $NetBSD: var.c,v 1.599 2020/10/30 15:39:17 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -129,7 +129,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.598 2020/10/30 15:28:38 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.599 2020/10/30 15:39:17 rillig Exp $");
#define VAR_DEBUG1(fmt, arg1) DEBUG1(VAR, fmt, arg1)
#define VAR_DEBUG2(fmt, arg1, arg2) DEBUG2(VAR, fmt, arg1, arg2)
@@ -378,7 +378,7 @@ VarFind(const char *name, GNode *ctxt, B
*/
var = GNode_FindVar(ctxt, name, nameHash);
if (!elsewhere)
- return var;
+ return var;
if (var == NULL && ctxt != VAR_CMDLINE)
var = GNode_FindVar(VAR_CMDLINE, name, nameHash);
@@ -593,8 +593,8 @@ Var_ExportVars(void)
return;
if (var_exportedVars == VAR_EXPORTED_ALL) {
- HashIter hi;
- HashEntry *he;
+ HashIter hi;
+ HashEntry *he;
/* Ouch! Exporting all variables at once is crazy... */
HashIter_Init(&hi, &VAR_GLOBAL->context);
@@ -824,7 +824,7 @@ Var_Set_with_flags(const char *name, con
VAR_DEBUG3("%s:%s = %s ignored (read-only)\n",
ctxt->name, name, val);
goto out;
- }
+ }
Buf_Empty(&v->val);
if (val)
Buf_AddStr(&v->val, val);
@@ -934,8 +934,8 @@ Var_Append(const char *name, const char
name = name_freeIt;
if (name[0] == '\0') {
VAR_DEBUG2("Var_Append(\"%s\", \"%s\", ...) "
- "name expands to empty string - ignored\n",
- unexpanded_name, val);
+ "name expands to empty string - ignored\n",
+ unexpanded_name, val);
free(name_freeIt);
return;
}
@@ -950,7 +950,7 @@ Var_Append(const char *name, const char
Buf_AddStr(&v->val, val);
VAR_DEBUG3("%s:%s = %s\n",
- ctxt->name, name, Buf_GetAll(&v->val, NULL));
+ ctxt->name, name, Buf_GetAll(&v->val, NULL));
if (v->flags & VAR_FROM_ENV) {
HashEntry *h;
@@ -1894,8 +1894,8 @@ ParseModifierPart(
const char *varstart;
Boolean is_escaped = p[0] == '\\' && (
- p[1] == delim || p[1] == '\\' || p[1] == '$' ||
- (p[1] == '&' && subst != NULL));
+ p[1] == delim || p[1] == '\\' || p[1] == '$' ||
+ (p[1] == '&' && subst != NULL));
if (is_escaped) {
Buf_AddByte(&buf, p[1]);
p += 2;
@@ -2427,7 +2427,7 @@ ApplyModifier_Regex(const char **pp, App
*pp += 2;
res = ParseModifierPart(pp, delim, st->eflags, st,
- &re, NULL, NULL, NULL);
+ &re, NULL, NULL, NULL);
if (res != VPR_OK)
return AMR_CLEANUP;
@@ -3225,7 +3225,7 @@ ApplyModifiers(
}
VAR_DEBUG3("Indirect modifier \"%s\" from \"%.*s\"\n",
- rval, (int)(size_t)(nested_p - p), p);
+ rval, (int)(size_t)(nested_p - p), p);
p = nested_p;
@@ -3897,8 +3897,8 @@ Var_Dump(GNode *ctxt)
qsort(varnames, vec.len, sizeof varnames[0], str_cmp_asc);
for (i = 0; i < vec.len; i++) {
- const char *varname = varnames[i];
- Var *var = HashTable_FindValue(&ctxt->context, varname);
+ const char *varname = varnames[i];
+ Var *var = HashTable_FindValue(&ctxt->context, varname);
debug_printf("%-16s = %s\n", varname, Buf_GetAll(&var->val, NULL));
}
