Module Name: src
Committed By: rillig
Date: Sat Aug 1 14:47:49 UTC 2020
Modified Files:
src/usr.bin/make: arch.c compat.c cond.c dir.c for.c hash.c hash.h
job.c lst.c main.c make_malloc.h parse.c suff.c util.c var.c
Log Message:
make(1): use consistent indentation in source code
Tabs for multiples of 8, then spaces.
The usage string has been kept as-is since the spaces there are
indentional and do influence the output.
To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 src/usr.bin/make/arch.c
cvs rdiff -u -r1.117 -r1.118 src/usr.bin/make/compat.c
cvs rdiff -u -r1.84 -r1.85 src/usr.bin/make/cond.c
cvs rdiff -u -r1.82 -r1.83 src/usr.bin/make/dir.c
cvs rdiff -u -r1.57 -r1.58 src/usr.bin/make/for.c src/usr.bin/make/util.c
cvs rdiff -u -r1.25 -r1.26 src/usr.bin/make/hash.c
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/make/hash.h
cvs rdiff -u -r1.204 -r1.205 src/usr.bin/make/job.c
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/make/lst.c
cvs rdiff -u -r1.290 -r1.291 src/usr.bin/make/main.c
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/make/make_malloc.h
cvs rdiff -u -r1.245 -r1.246 src/usr.bin/make/parse.c
cvs rdiff -u -r1.92 -r1.93 src/usr.bin/make/suff.c
cvs rdiff -u -r1.379 -r1.380 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/arch.c
diff -u src/usr.bin/make/arch.c:1.79 src/usr.bin/make/arch.c:1.80
--- src/usr.bin/make/arch.c:1.79 Sat Aug 1 09:55:00 2020
+++ src/usr.bin/make/arch.c Sat Aug 1 14:47:49 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: arch.c,v 1.79 2020/08/01 09:55:00 rillig Exp $ */
+/* $NetBSD: arch.c,v 1.80 2020/08/01 14:47:49 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: arch.c,v 1.79 2020/08/01 09:55:00 rillig Exp $";
+static char rcsid[] = "$NetBSD: arch.c,v 1.80 2020/08/01 14:47:49 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)arch.c 8.2 (Berkeley) 1/2/94";
#else
-__RCSID("$NetBSD: arch.c,v 1.79 2020/08/01 09:55:00 rillig Exp $");
+__RCSID("$NetBSD: arch.c,v 1.80 2020/08/01 14:47:49 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -534,7 +534,7 @@ ArchStatMember(const char *archive, cons
Hash_Entry *he; /* Entry containing member's description */
struct ar_hdr arh; /* archive-member header for reading archive */
char memName[MAXPATHLEN+1];
- /* Current member name while hashing. */
+ /* Current member name while hashing. */
/*
* Because of space constraints and similar things, files are archived
@@ -604,7 +604,7 @@ ArchStatMember(const char *archive, cons
* can handle...
*/
if ((fread(magic, SARMAG, 1, arch) != 1) ||
- (strncmp(magic, ARMAG, SARMAG) != 0)) {
+ (strncmp(magic, ARMAG, SARMAG) != 0)) {
fclose(arch);
return NULL;
}
@@ -786,7 +786,7 @@ ArchSVR4Entry(Arch *ar, char *name, size
}
if (DEBUG(ARCH)) {
fprintf(debug_file, "Found svr4 archive name table with %lu entries\n",
- (unsigned long)entry);
+ (unsigned long)entry);
}
return 0;
}
@@ -862,7 +862,7 @@ ArchFindMember(const char *archive, cons
* can handle...
*/
if ((fread(magic, SARMAG, 1, arch) != 1) ||
- (strncmp(magic, ARMAG, SARMAG) != 0)) {
+ (strncmp(magic, ARMAG, SARMAG) != 0)) {
fclose(arch);
return NULL;
}
Index: src/usr.bin/make/compat.c
diff -u src/usr.bin/make/compat.c:1.117 src/usr.bin/make/compat.c:1.118
--- src/usr.bin/make/compat.c:1.117 Sat Aug 1 09:55:00 2020
+++ src/usr.bin/make/compat.c Sat Aug 1 14:47:49 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: compat.c,v 1.117 2020/08/01 09:55:00 rillig Exp $ */
+/* $NetBSD: compat.c,v 1.118 2020/08/01 14:47:49 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.117 2020/08/01 09:55:00 rillig Exp $";
+static char rcsid[] = "$NetBSD: compat.c,v 1.118 2020/08/01 14:47:49 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.117 2020/08/01 09:55:00 rillig Exp $");
+__RCSID("$NetBSD: compat.c,v 1.118 2020/08/01 14:47:49 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -212,7 +212,7 @@ CompatRunCommand(void *cmdp, void *gnp)
char *cmdStart; /* Start of expanded command */
char *cp, *bp;
Boolean silent, /* Don't print command */
- doIt; /* Execute even if -n */
+ doIt; /* Execute even if -n */
volatile Boolean errCheck; /* Check errors */
int reason; /* Reason for child's death */
int status; /* Description of child's death */
@@ -433,18 +433,18 @@ again:
#endif
if (status != 0) {
if (DEBUG(ERROR)) {
- fprintf(debug_file, "\n*** Failed target: %s\n*** Failed command: ",
+ fprintf(debug_file, "\n*** Failed target: %s\n*** Failed command: ",
gn->name);
- for (cp = cmd; *cp; ) {
- if (isspace((unsigned char)*cp)) {
+ for (cp = cmd; *cp; ) {
+ if (isspace((unsigned char)*cp)) {
fprintf(debug_file, " ");
- while (isspace((unsigned char)*cp))
+ while (isspace((unsigned char)*cp))
cp++;
} else {
fprintf(debug_file, "%c", *cp);
- cp++;
+ cp++;
}
- }
+ }
fprintf(debug_file, "\n");
}
printf("*** Error code %d", status);
@@ -729,10 +729,10 @@ Compat_Run(Lst targs)
gn = Targ_FindNode(".BEGIN", TARG_NOCREATE);
if (gn != NULL) {
Compat_Make(gn, gn);
- if (gn->made == ERROR) {
- PrintOnError(gn, "\nStop.");
- exit(1);
- }
+ if (gn->made == ERROR) {
+ PrintOnError(gn, "\nStop.");
+ exit(1);
+ }
}
}
Index: src/usr.bin/make/cond.c
diff -u src/usr.bin/make/cond.c:1.84 src/usr.bin/make/cond.c:1.85
--- src/usr.bin/make/cond.c:1.84 Sat Aug 1 09:55:00 2020
+++ src/usr.bin/make/cond.c Sat Aug 1 14:47:49 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cond.c,v 1.84 2020/08/01 09:55:00 rillig Exp $ */
+/* $NetBSD: cond.c,v 1.85 2020/08/01 14:47:49 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.84 2020/08/01 09:55:00 rillig Exp $";
+static char rcsid[] = "$NetBSD: cond.c,v 1.85 2020/08/01 14:47:49 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.84 2020/08/01 09:55:00 rillig Exp $");
+__RCSID("$NetBSD: cond.c,v 1.85 2020/08/01 14:47:49 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -857,7 +857,7 @@ compare_function(Boolean doEval)
static const struct fn_def {
const char *fn_name;
int fn_name_len;
- int (*fn_getarg)(Boolean, char **, char **, const char *);
+ int (*fn_getarg)(Boolean, char **, char **, const char *);
Boolean (*fn_proc)(int, const char *);
} fn_defs[] = {
{ "defined", 7, CondGetArg, CondDoDefined },
Index: src/usr.bin/make/dir.c
diff -u src/usr.bin/make/dir.c:1.82 src/usr.bin/make/dir.c:1.83
--- src/usr.bin/make/dir.c:1.82 Fri Jul 31 20:57:38 2020
+++ src/usr.bin/make/dir.c Sat Aug 1 14:47:49 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: dir.c,v 1.82 2020/07/31 20:57:38 rillig Exp $ */
+/* $NetBSD: dir.c,v 1.83 2020/08/01 14:47:49 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: dir.c,v 1.82 2020/07/31 20:57:38 rillig Exp $";
+static char rcsid[] = "$NetBSD: dir.c,v 1.83 2020/08/01 14:47:49 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)dir.c 8.2 (Berkeley) 1/2/94";
#else
-__RCSID("$NetBSD: dir.c,v 1.82 2020/07/31 20:57:38 rillig Exp $");
+__RCSID("$NetBSD: dir.c,v 1.83 2020/08/01 14:47:49 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -965,7 +965,7 @@ Dir_Expand(const char *word, Lst path, L
*/
static char *
DirLookup(Path *p, const char *name MAKE_ATTR_UNUSED, const char *cp,
- Boolean hasSlash MAKE_ATTR_UNUSED)
+ Boolean hasSlash MAKE_ATTR_UNUSED)
{
char *file; /* the current filename to check */
@@ -1182,7 +1182,7 @@ Dir_FindFile(const char *name, Lst path)
p = (Path *)Lst_Datum(ln);
if (p == dotLast) {
hasLastDot = TRUE;
- if (DEBUG(DIR))
+ if (DEBUG(DIR))
fprintf(debug_file, "[dot last]...");
}
}
@@ -1448,7 +1448,7 @@ Dir_FindHereOrAbove(char *here, char *se
struct stat st;
char dirbase[MAXPATHLEN + 1], *db_end;
- char try[MAXPATHLEN + 1], *try_end;
+ char try[MAXPATHLEN + 1], *try_end;
/* copy out our starting point */
snprintf(dirbase, sizeof(dirbase), "%s", here);
Index: src/usr.bin/make/for.c
diff -u src/usr.bin/make/for.c:1.57 src/usr.bin/make/for.c:1.58
--- src/usr.bin/make/for.c:1.57 Tue Jul 28 16:45:56 2020
+++ src/usr.bin/make/for.c Sat Aug 1 14:47:49 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: for.c,v 1.57 2020/07/28 16:45:56 rillig Exp $ */
+/* $NetBSD: for.c,v 1.58 2020/08/01 14:47:49 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.57 2020/07/28 16:45:56 rillig Exp $";
+static char rcsid[] = "$NetBSD: for.c,v 1.58 2020/08/01 14:47:49 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.57 2020/07/28 16:45:56 rillig Exp $");
+__RCSID("$NetBSD: for.c,v 1.58 2020/08/01 14:47:49 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -487,9 +487,9 @@ For_Run(int lineno)
accumFor = NULL;
if (strlist_num(&arg->items) == 0) {
- /* Nothing to expand - possibly due to an earlier syntax error. */
- For_Free(arg);
- return;
+ /* Nothing to expand - possibly due to an earlier syntax error. */
+ For_Free(arg);
+ return;
}
Parse_SetInput(NULL, lineno, -1, For_Iterate, arg);
Index: src/usr.bin/make/util.c
diff -u src/usr.bin/make/util.c:1.57 src/usr.bin/make/util.c:1.58
--- src/usr.bin/make/util.c:1.57 Fri Jul 3 08:13:23 2020
+++ src/usr.bin/make/util.c Sat Aug 1 14:47:49 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: util.c,v 1.57 2020/07/03 08:13:23 rillig Exp $ */
+/* $NetBSD: util.c,v 1.58 2020/08/01 14:47:49 rillig Exp $ */
/*
* Missing stuff from OS's
@@ -8,11 +8,11 @@
#endif
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: util.c,v 1.57 2020/07/03 08:13:23 rillig Exp $";
+static char rcsid[] = "$NetBSD: util.c,v 1.58 2020/08/01 14:47:49 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: util.c,v 1.57 2020/07/03 08:13:23 rillig Exp $");
+__RCSID("$NetBSD: util.c,v 1.58 2020/08/01 14:47:49 rillig Exp $");
#endif
#endif
@@ -178,39 +178,39 @@ strrcpy(char *ptr, char *str)
} /* end strrcpy */
char *sys_siglist[] = {
- "Signal 0",
- "Hangup", /* SIGHUP */
- "Interrupt", /* SIGINT */
- "Quit", /* SIGQUIT */
- "Illegal instruction", /* SIGILL */
- "Trace/BPT trap", /* SIGTRAP */
- "IOT trap", /* SIGIOT */
- "EMT trap", /* SIGEMT */
- "Floating point exception", /* SIGFPE */
- "Killed", /* SIGKILL */
- "Bus error", /* SIGBUS */
- "Segmentation fault", /* SIGSEGV */
- "Bad system call", /* SIGSYS */
- "Broken pipe", /* SIGPIPE */
- "Alarm clock", /* SIGALRM */
- "Terminated", /* SIGTERM */
- "User defined signal 1", /* SIGUSR1 */
- "User defined signal 2", /* SIGUSR2 */
- "Child exited", /* SIGCLD */
- "Power-fail restart", /* SIGPWR */
- "Virtual timer expired", /* SIGVTALRM */
- "Profiling timer expired", /* SIGPROF */
- "I/O possible", /* SIGIO */
- "Window size changes", /* SIGWINDOW */
- "Stopped (signal)", /* SIGSTOP */
- "Stopped", /* SIGTSTP */
- "Continued", /* SIGCONT */
- "Stopped (tty input)", /* SIGTTIN */
- "Stopped (tty output)", /* SIGTTOU */
- "Urgent I/O condition", /* SIGURG */
- "Remote lock lost (NFS)", /* SIGLOST */
- "Signal 31", /* reserved */
- "DIL signal" /* SIGDIL */
+ "Signal 0",
+ "Hangup", /* SIGHUP */
+ "Interrupt", /* SIGINT */
+ "Quit", /* SIGQUIT */
+ "Illegal instruction", /* SIGILL */
+ "Trace/BPT trap", /* SIGTRAP */
+ "IOT trap", /* SIGIOT */
+ "EMT trap", /* SIGEMT */
+ "Floating point exception", /* SIGFPE */
+ "Killed", /* SIGKILL */
+ "Bus error", /* SIGBUS */
+ "Segmentation fault", /* SIGSEGV */
+ "Bad system call", /* SIGSYS */
+ "Broken pipe", /* SIGPIPE */
+ "Alarm clock", /* SIGALRM */
+ "Terminated", /* SIGTERM */
+ "User defined signal 1", /* SIGUSR1 */
+ "User defined signal 2", /* SIGUSR2 */
+ "Child exited", /* SIGCLD */
+ "Power-fail restart", /* SIGPWR */
+ "Virtual timer expired", /* SIGVTALRM */
+ "Profiling timer expired", /* SIGPROF */
+ "I/O possible", /* SIGIO */
+ "Window size changes", /* SIGWINDOW */
+ "Stopped (signal)", /* SIGSTOP */
+ "Stopped", /* SIGTSTP */
+ "Continued", /* SIGCONT */
+ "Stopped (tty input)", /* SIGTTIN */
+ "Stopped (tty output)", /* SIGTTOU */
+ "Urgent I/O condition", /* SIGURG */
+ "Remote lock lost (NFS)", /* SIGLOST */
+ "Signal 31", /* reserved */
+ "DIL signal" /* SIGDIL */
};
#endif /* __hpux__ || __hpux */
Index: src/usr.bin/make/hash.c
diff -u src/usr.bin/make/hash.c:1.25 src/usr.bin/make/hash.c:1.26
--- src/usr.bin/make/hash.c:1.25 Mon Jul 20 18:12:48 2020
+++ src/usr.bin/make/hash.c Sat Aug 1 14:47:49 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: hash.c,v 1.25 2020/07/20 18:12:48 sjg Exp $ */
+/* $NetBSD: hash.c,v 1.26 2020/08/01 14:47:49 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: hash.c,v 1.25 2020/07/20 18:12:48 sjg Exp $";
+static char rcsid[] = "$NetBSD: hash.c,v 1.26 2020/08/01 14:47:49 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)hash.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: hash.c,v 1.25 2020/07/20 18:12:48 sjg Exp $");
+__RCSID("$NetBSD: hash.c,v 1.26 2020/08/01 14:47:49 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -476,7 +476,7 @@ RebuildTable(Hash_Table *t)
{
Hash_Entry *e, *next = NULL, **hp, **xp;
int i, mask;
- Hash_Entry **oldhp;
+ Hash_Entry **oldhp;
int oldsize;
oldhp = t->bucketPtr;
Index: src/usr.bin/make/hash.h
diff -u src/usr.bin/make/hash.h:1.15 src/usr.bin/make/hash.h:1.16
--- src/usr.bin/make/hash.h:1.15 Mon Jul 20 18:12:48 2020
+++ src/usr.bin/make/hash.h Sat Aug 1 14:47:49 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: hash.h,v 1.15 2020/07/20 18:12:48 sjg Exp $ */
+/* $NetBSD: hash.h,v 1.16 2020/08/01 14:47:49 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -87,7 +87,7 @@
typedef struct Hash_Entry {
struct Hash_Entry *next; /* Used to link together all the
- * entries associated with the same
+ * entries associated with the same
* bucket. */
void *clientPtr; /* Arbitrary pointer */
unsigned namehash; /* hash value of key */
@@ -96,7 +96,7 @@ typedef struct Hash_Entry {
typedef struct Hash_Table {
struct Hash_Entry **bucketPtr;/* Pointers to Hash_Entry, one
- * for each bucket in the table. */
+ * for each bucket in the table. */
int size; /* Actual size of array. */
int numEntries; /* Number of entries in the table. */
int mask; /* Used to select bits for hashing. */
Index: src/usr.bin/make/job.c
diff -u src/usr.bin/make/job.c:1.204 src/usr.bin/make/job.c:1.205
--- src/usr.bin/make/job.c:1.204 Sat Aug 1 09:55:00 2020
+++ src/usr.bin/make/job.c Sat Aug 1 14:47:49 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: job.c,v 1.204 2020/08/01 09:55:00 rillig Exp $ */
+/* $NetBSD: job.c,v 1.205 2020/08/01 14:47:49 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: job.c,v 1.204 2020/08/01 09:55:00 rillig Exp $";
+static char rcsid[] = "$NetBSD: job.c,v 1.205 2020/08/01 14:47:49 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)job.c 8.2 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: job.c,v 1.204 2020/08/01 09:55:00 rillig Exp $");
+__RCSID("$NetBSD: job.c,v 1.205 2020/08/01 14:47:49 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -298,7 +298,7 @@ static Shell *commandShell = &shells[DEF
* Job_ParseShell function */
const char *shellPath = NULL, /* full pathname of
* executable image */
- *shellName = NULL; /* last component of shell */
+ *shellName = NULL; /* last component of shell */
char *shellErrFlag = NULL;
static const char *shellArgv = NULL; /* Custom shell args */
@@ -1285,7 +1285,7 @@ Job_CheckCommands(GNode *gn, void (*abor
(void)fprintf(stdout, "%s%s %s (continuing)\n", progname,
msg, gn->name);
(void)fflush(stdout);
- return FALSE;
+ return FALSE;
} else {
(*abortProc)("%s%s %s. Stop", progname, msg, gn->name);
return FALSE;
@@ -1328,7 +1328,7 @@ JobExec(Job *job, char **argv)
for (i = 0; argv[i] != NULL; i++) {
(void)fprintf(debug_file, "%s ", argv[i]);
}
- (void)fprintf(debug_file, "\n");
+ (void)fprintf(debug_file, "\n");
}
/*
@@ -1700,7 +1700,7 @@ JobStart(GNode *gn, int flags)
* up the graph.
*/
job->cmdFILE = stdout;
- Job_Touch(gn, job->flags&JOB_SILENT);
+ Job_Touch(gn, job->flags&JOB_SILENT);
noExec = TRUE;
}
/* Just in case it isn't already... */
@@ -3106,7 +3106,7 @@ emul_poll(struct pollfd *fd, int nfd, in
usecs = timeout * 1000;
tv.tv_sec = usecs / 1000000;
tv.tv_usec = usecs % 1000000;
- tvp = &tv;
+ tvp = &tv;
}
nselect = select(maxfd + 1, &rfds, &wfds, 0, tvp);
Index: src/usr.bin/make/lst.c
diff -u src/usr.bin/make/lst.c:1.2 src/usr.bin/make/lst.c:1.3
--- src/usr.bin/make/lst.c:1.2 Sun Jul 26 07:24:27 2020
+++ src/usr.bin/make/lst.c Sat Aug 1 14:47:49 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: lst.c,v 1.2 2020/07/26 07:24:27 rillig Exp $ */
+/* $NetBSD: lst.c,v 1.3 2020/08/01 14:47:49 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -36,11 +36,11 @@
#include "make_malloc.h"
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: lst.c,v 1.2 2020/07/26 07:24:27 rillig Exp $";
+static char rcsid[] = "$NetBSD: lst.c,v 1.3 2020/08/01 14:47:49 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: lst.c,v 1.2 2020/07/26 07:24:27 rillig Exp $");
+__RCSID("$NetBSD: lst.c,v 1.3 2020/08/01 14:47:49 rillig Exp $");
#endif /* not lint */
#endif
@@ -50,7 +50,7 @@ typedef struct ListNode {
unsigned int useCount:8, /* Count of functions using the node.
* node may not be deleted until count
* goes to 0 */
- flags:8; /* Node status flags */
+ flags:8; /* Node status flags */
void *datum; /* datum associated with this element */
} *ListNode;
/*
@@ -929,7 +929,7 @@ Lst_Concat(Lst l1, Lst l2, int flags)
*/
list2->firstPtr->prevPtr = list1->lastPtr;
if (list1->lastPtr != NULL) {
- list1->lastPtr->nextPtr = list2->firstPtr;
+ list1->lastPtr->nextPtr = list2->firstPtr;
} else {
list1->firstPtr = list2->firstPtr;
}
Index: src/usr.bin/make/main.c
diff -u src/usr.bin/make/main.c:1.290 src/usr.bin/make/main.c:1.291
--- src/usr.bin/make/main.c:1.290 Sat Aug 1 09:55:00 2020
+++ src/usr.bin/make/main.c Sat Aug 1 14:47:49 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.290 2020/08/01 09:55:00 rillig Exp $ */
+/* $NetBSD: main.c,v 1.291 2020/08/01 14:47:49 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,7 +69,7 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: main.c,v 1.290 2020/08/01 09:55:00 rillig Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.291 2020/08/01 14:47:49 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
@@ -81,7 +81,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 19
#if 0
static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: main.c,v 1.290 2020/08/01 09:55:00 rillig Exp $");
+__RCSID("$NetBSD: main.c,v 1.291 2020/08/01 14:47:49 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -959,7 +959,7 @@ main(int argc, char **argv)
struct stat sb, sa;
char *p1, *path;
char mdpath[MAXPATHLEN];
- const char *machine = getenv("MACHINE");
+ const char *machine = getenv("MACHINE");
const char *machine_arch = getenv("MACHINE_ARCH");
char *syspath = getenv("MAKESYSPATH");
Lst sysMkPath; /* Path of sys.mk */
@@ -1044,7 +1044,7 @@ main(int argc, char **argv)
#else
#ifndef MACHINE_ARCH
#ifdef MAKE_MACHINE_ARCH
- machine_arch = MAKE_MACHINE_ARCH;
+ machine_arch = MAKE_MACHINE_ARCH;
#else
machine_arch = "unknown";
#endif
@@ -1487,7 +1487,7 @@ main(int argc, char **argv)
meta_finish();
#endif
Suff_End();
- Targ_End();
+ Targ_End();
Arch_End();
Var_End();
Parse_End();
@@ -1853,7 +1853,7 @@ DieHorribly(void)
*/
void
Finish(int errors)
- /* number of errors encountered in Make_Make */
+ /* number of errors encountered in Make_Make */
{
if (dieQuietly(NULL, -1))
exit(2);
Index: src/usr.bin/make/make_malloc.h
diff -u src/usr.bin/make/make_malloc.h:1.5 src/usr.bin/make/make_malloc.h:1.6
--- src/usr.bin/make/make_malloc.h:1.5 Sat Aug 1 09:55:00 2020
+++ src/usr.bin/make/make_malloc.h Sat Aug 1 14:47:49 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: make_malloc.h,v 1.5 2020/08/01 09:55:00 rillig Exp $ */
+/* $NetBSD: make_malloc.h,v 1.6 2020/08/01 14:47:49 rillig Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -49,5 +49,5 @@ static inline void
bmake_free(void *p)
{
if (p != NULL)
- free(p);
+ free(p);
}
Index: src/usr.bin/make/parse.c
diff -u src/usr.bin/make/parse.c:1.245 src/usr.bin/make/parse.c:1.246
--- src/usr.bin/make/parse.c:1.245 Sat Aug 1 09:55:00 2020
+++ src/usr.bin/make/parse.c Sat Aug 1 14:47:49 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.245 2020/08/01 09:55:00 rillig Exp $ */
+/* $NetBSD: parse.c,v 1.246 2020/08/01 14:47:49 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: parse.c,v 1.245 2020/08/01 09:55:00 rillig Exp $";
+static char rcsid[] = "$NetBSD: parse.c,v 1.246 2020/08/01 14:47:49 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.245 2020/08/01 09:55:00 rillig Exp $");
+__RCSID("$NetBSD: parse.c,v 1.246 2020/08/01 14:47:49 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -1597,9 +1597,9 @@ ParseDoDependency(char *line)
Dir_SetPATH();
break;
#ifdef POSIX
- case Posix:
- Var_Set("%POSIX", "1003.2", VAR_GLOBAL);
- break;
+ case Posix:
+ Var_Set("%POSIX", "1003.2", VAR_GLOBAL);
+ break;
#endif
default:
break;
@@ -2236,7 +2236,7 @@ Parse_include_file(char *file, Boolean i
if (fullname == NULL) {
/*
- * Makefile wasn't found in same directory as included makefile.
+ * Makefile wasn't found in same directory as included makefile.
* Search for it first on the -I search path,
* then on the .PATH search path, if not found in a -I directory.
* If we have a suffix specific path we should use that.
@@ -2510,7 +2510,7 @@ Parse_SetInput(const char *name, int lin
/* Get first block of input data */
buf = curFile->nextbuf(curFile->nextbuf_arg, &len);
if (buf == NULL) {
- /* Was all a waste of time ... */
+ /* Was all a waste of time ... */
if (curFile->fname)
free(curFile->fname);
free(curFile);
@@ -3338,7 +3338,7 @@ Parse_MainName(void)
if (mainNode == NULL) {
Punt("no target to make.");
- /*NOTREACHED*/
+ /*NOTREACHED*/
} else if (mainNode->type & OP_DOUBLEDEP) {
(void)Lst_AtEnd(mainList, mainNode);
Lst_Concat(mainList, mainNode->cohorts, LST_CONCNEW);
Index: src/usr.bin/make/suff.c
diff -u src/usr.bin/make/suff.c:1.92 src/usr.bin/make/suff.c:1.93
--- src/usr.bin/make/suff.c:1.92 Sat Aug 1 09:55:00 2020
+++ src/usr.bin/make/suff.c Sat Aug 1 14:47:49 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: suff.c,v 1.92 2020/08/01 09:55:00 rillig Exp $ */
+/* $NetBSD: suff.c,v 1.93 2020/08/01 14:47:49 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: suff.c,v 1.92 2020/08/01 09:55:00 rillig Exp $";
+static char rcsid[] = "$NetBSD: suff.c,v 1.93 2020/08/01 14:47:49 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.92 2020/08/01 09:55:00 rillig Exp $");
+__RCSID("$NetBSD: suff.c,v 1.93 2020/08/01 14:47:49 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -397,7 +397,7 @@ SuffGNHasNameP(const void *gn, const voi
return strcmp(name, ((const GNode *)gn)->name);
}
- /*********** Maintenance Functions ************/
+ /*********** Maintenance Functions ************/
static void
SuffUnRef(void *lp, void *sp)
@@ -699,7 +699,7 @@ Suff_AddTransform(char *line)
{
GNode *gn; /* GNode of transformation rule */
Suff *s, /* source suffix */
- *t; /* target suffix */
+ *t; /* target suffix */
LstNode ln; /* Node for existing transformation */
ln = Lst_Find(transforms, line, SuffGNHasNameP);
@@ -1167,7 +1167,7 @@ Suff_AddLib(char *sname)
}
}
- /********** Implicit Source Search Functions *********/
+ /********** Implicit Source Search Functions *********/
/*-
*-----------------------------------------------------------------------
@@ -1425,7 +1425,7 @@ SuffFindCmds(Src *targ, Lst slst)
{
LstNode ln; /* General-purpose list node */
GNode *t, /* Target GNode */
- *s; /* Source GNode */
+ *s; /* Source GNode */
int prefLen;/* The length of the defined prefix */
Suff *suff; /* Suffix on matching beastie */
Src *ret; /* Return value */
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.379 src/usr.bin/make/var.c:1.380
--- src/usr.bin/make/var.c:1.379 Sat Aug 1 13:51:40 2020
+++ src/usr.bin/make/var.c Sat Aug 1 14:47:49 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.379 2020/08/01 13:51:40 rillig Exp $ */
+/* $NetBSD: var.c,v 1.380 2020/08/01 14:47:49 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: var.c,v 1.379 2020/08/01 13:51:40 rillig Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.380 2020/08/01 14:47:49 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.379 2020/08/01 13:51:40 rillig Exp $");
+__RCSID("$NetBSD: var.c,v 1.380 2020/08/01 14:47:49 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -788,7 +788,7 @@ Var_Set_with_flags(const char *name, con
* point in searching them all just to save a bit of memory...
*/
if (strchr(name, '$') != NULL) {
- const char *unexpanded_name = name;
+ const char *unexpanded_name = name;
name = name_freeIt = Var_Subst(name, ctxt, VARE_WANTRES);
if (name[0] == '\0') {
if (DEBUG(VAR)) {
@@ -1213,7 +1213,7 @@ Str_SYSVMatch(const char *word, const ch
const char *w_tail = w + w_len - p_len;
if (memcmp(p, w_tail, p_len) != 0)
- return NULL;
+ return NULL;
*match_len = w_tail - w;
return w;
@@ -2542,7 +2542,7 @@ ApplyModifier_ToSep(const char *sep, App
get_numeric:
st->sep = strtoul(sep + 1 + (sep[1] == 'x'), &end, base);
if (*end != ':' && *end != st->endc)
- return AMR_BAD;
+ return AMR_BAD;
st->next = end;
break;
}
