Module Name: src
Committed By: rillig
Date: Mon Nov 23 20:41:20 UTC 2020
Modified Files:
src/usr.bin/make: cond.c dir.c job.c make.h meta.c parse.c suff.c
util.c
src/usr.bin/make/filemon: filemon_ktrace.c
Log Message:
make(1): align end-of-line comments with tabs
To generate a diff of this commit:
cvs rdiff -u -r1.215 -r1.216 src/usr.bin/make/cond.c
cvs rdiff -u -r1.212 -r1.213 src/usr.bin/make/dir.c
cvs rdiff -u -r1.326 -r1.327 src/usr.bin/make/job.c
cvs rdiff -u -r1.214 -r1.215 src/usr.bin/make/make.h
cvs rdiff -u -r1.144 -r1.145 src/usr.bin/make/meta.c
cvs rdiff -u -r1.448 -r1.449 src/usr.bin/make/parse.c
cvs rdiff -u -r1.307 -r1.308 src/usr.bin/make/suff.c
cvs rdiff -u -r1.68 -r1.69 src/usr.bin/make/util.c
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/make/filemon/filemon_ktrace.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/cond.c
diff -u src/usr.bin/make/cond.c:1.215 src/usr.bin/make/cond.c:1.216
--- src/usr.bin/make/cond.c:1.215 Mon Nov 23 20:05:31 2020
+++ src/usr.bin/make/cond.c Mon Nov 23 20:41:20 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cond.c,v 1.215 2020/11/23 20:05:31 rillig Exp $ */
+/* $NetBSD: cond.c,v 1.216 2020/11/23 20:41:20 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -94,7 +94,7 @@
#include "dir.h"
/* "@(#)cond.c 8.2 (Berkeley) 1/2/94" */
-MAKE_RCSID("$NetBSD: cond.c,v 1.215 2020/11/23 20:05:31 rillig Exp $");
+MAKE_RCSID("$NetBSD: cond.c,v 1.216 2020/11/23 20:41:20 rillig Exp $");
/*
* The parsing of conditional expressions is based on this grammar:
@@ -1182,7 +1182,7 @@ Cond_EvalLine(const char *const line)
/* Quite likely this is 'else' or 'elif' */
p += 2;
- if (is_token(p, "se", 2)) { /* It is an 'else'. */
+ if (is_token(p, "se", 2)) { /* It is an 'else'. */
if (opts.lint && p[2] != '\0')
Parse_Error(PARSE_FATAL,
Index: src/usr.bin/make/dir.c
diff -u src/usr.bin/make/dir.c:1.212 src/usr.bin/make/dir.c:1.213
--- src/usr.bin/make/dir.c:1.212 Mon Nov 23 20:21:34 2020
+++ src/usr.bin/make/dir.c Mon Nov 23 20:41:20 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: dir.c,v 1.212 2020/11/23 20:21:34 rillig Exp $ */
+/* $NetBSD: dir.c,v 1.213 2020/11/23 20:41:20 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.212 2020/11/23 20:21:34 rillig Exp $");
+MAKE_RCSID("$NetBSD: dir.c,v 1.213 2020/11/23 20:41:20 rillig Exp $");
#define DIR_DEBUG0(text) DEBUG0(DIR, text)
#define DIR_DEBUG1(fmt, arg1) DEBUG1(DIR, fmt, arg1)
@@ -439,7 +439,7 @@ Dir_InitDot(void)
* count to make sure it's not destroyed.
*/
dot->refCount++;
- Dir_SetPATH(); /* initialize */
+ Dir_SetPATH(); /* initialize */
}
/* Clean up the directories module. */
@@ -721,8 +721,8 @@ DirExpandCurly(const char *word, const c
Lst_Append(expansions, file);
}
- piece = piece_end +
- 1; /* skip over the comma or closing brace */
+ /* skip over the comma or closing brace */
+ piece = piece_end + 1;
}
}
Index: src/usr.bin/make/job.c
diff -u src/usr.bin/make/job.c:1.326 src/usr.bin/make/job.c:1.327
--- src/usr.bin/make/job.c:1.326 Mon Nov 16 18:28:27 2020
+++ src/usr.bin/make/job.c Mon Nov 23 20:41:20 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: job.c,v 1.326 2020/11/16 18:28:27 rillig Exp $ */
+/* $NetBSD: job.c,v 1.327 2020/11/23 20:41:20 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.326 2020/11/16 18:28:27 rillig Exp $");
+MAKE_RCSID("$NetBSD: job.c,v 1.327 2020/11/23 20:41:20 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
@@ -1110,7 +1110,7 @@ TouchRegular(GNode *gn)
(void)fprintf(stderr, "*** couldn't touch %s: %s\n",
file, strerror(errno));
(void)fflush(stderr);
- return; /* XXX: What about propagating the error? */
+ return; /* XXX: What about propagating the error? */
}
/* Last resort: update the file's time stamps in the traditional way.
Index: src/usr.bin/make/make.h
diff -u src/usr.bin/make/make.h:1.214 src/usr.bin/make/make.h:1.215
--- src/usr.bin/make/make.h:1.214 Sun Nov 22 21:34:34 2020
+++ src/usr.bin/make/make.h Mon Nov 23 20:41:20 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: make.h,v 1.214 2020/11/22 21:34:34 rillig Exp $ */
+/* $NetBSD: make.h,v 1.215 2020/11/23 20:41:20 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -490,12 +490,13 @@ extern pid_t myPid;
#define MAKEFLAGS ".MAKEFLAGS"
#define MAKEOVERRIDES ".MAKEOVERRIDES"
-#define MAKE_JOB_PREFIX ".MAKE.JOB.PREFIX" /* prefix for job target output */
-#define MAKE_EXPORTED ".MAKE.EXPORTED" /* variables we export */
-#define MAKE_MAKEFILES ".MAKE.MAKEFILES" /* all makefiles already loaded */
-#define MAKE_LEVEL ".MAKE.LEVEL" /* recursion level */
+#define MAKE_JOB_PREFIX ".MAKE.JOB.PREFIX" /* prefix when printing the
+ * target of a job */
+#define MAKE_EXPORTED ".MAKE.EXPORTED" /* exported variables */
+#define MAKE_MAKEFILES ".MAKE.MAKEFILES" /* all loaded makefiles */
+#define MAKE_LEVEL ".MAKE.LEVEL" /* recursion level */
#define MAKE_MAKEFILE_PREFERENCE ".MAKE.MAKEFILE_PREFERENCE"
-#define MAKE_DEPENDFILE ".MAKE.DEPENDFILE" /* .depend */
+#define MAKE_DEPENDFILE ".MAKE.DEPENDFILE" /* .depend */
#define MAKE_MODE ".MAKE.MODE"
#ifndef MAKE_LEVEL_ENV
# define MAKE_LEVEL_ENV "MAKELEVEL"
Index: src/usr.bin/make/meta.c
diff -u src/usr.bin/make/meta.c:1.144 src/usr.bin/make/meta.c:1.145
--- src/usr.bin/make/meta.c:1.144 Sun Nov 15 12:02:44 2020
+++ src/usr.bin/make/meta.c Mon Nov 23 20:41:20 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: meta.c,v 1.144 2020/11/15 12:02:44 rillig Exp $ */
+/* $NetBSD: meta.c,v 1.145 2020/11/23 20:41:20 rillig Exp $ */
/*
* Implement 'meta' mode.
@@ -75,7 +75,7 @@ static Boolean metaEnv = FALSE; /* don'
static Boolean metaVerbose = FALSE;
static Boolean metaIgnoreCMDs = FALSE; /* ignore CMDs in .meta files */
static Boolean metaIgnorePatterns = FALSE; /* do we need to do pattern matches */
-static Boolean metaIgnoreFilter = FALSE; /* do we have more complex filtering? */
+static Boolean metaIgnoreFilter = FALSE; /* do we have more complex filtering? */
static Boolean metaCurdirOk = FALSE; /* write .meta in .CURDIR Ok? */
static Boolean metaSilent = FALSE; /* if we have a .meta be SILENT */
@@ -1420,7 +1420,7 @@ meta_oodate(GNode *gn, Boolean oodate)
sdirs[sdx++] = p; /* done */
} else {
if (strcmp(".", p) == 0)
- continue; /* no point */
+ continue; /* no point */
/* Check vs latestdir */
snprintf(fname1, sizeof fname1, "%s/%s", latestdir, p);
Index: src/usr.bin/make/parse.c
diff -u src/usr.bin/make/parse.c:1.448 src/usr.bin/make/parse.c:1.449
--- src/usr.bin/make/parse.c:1.448 Sun Nov 22 20:36:17 2020
+++ src/usr.bin/make/parse.c Mon Nov 23 20:41:20 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.448 2020/11/22 20:36:17 rillig Exp $ */
+/* $NetBSD: parse.c,v 1.449 2020/11/23 20:41:20 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.448 2020/11/22 20:36:17 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.449 2020/11/23 20:41:20 rillig Exp $");
/* types and constants */
@@ -2788,7 +2788,7 @@ ParseReadLine(void)
continue;
case COND_PARSE:
continue;
- case COND_INVALID: /* Not a conditional line */
+ case COND_INVALID: /* Not a conditional line */
/* Check for .for loops */
rval = For_Eval(line);
if (rval == 0)
Index: src/usr.bin/make/suff.c
diff -u src/usr.bin/make/suff.c:1.307 src/usr.bin/make/suff.c:1.308
--- src/usr.bin/make/suff.c:1.307 Mon Nov 23 18:07:10 2020
+++ src/usr.bin/make/suff.c Mon Nov 23 20:41:20 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: suff.c,v 1.307 2020/11/23 18:07:10 rillig Exp $ */
+/* $NetBSD: suff.c,v 1.308 2020/11/23 20:41:20 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -114,7 +114,7 @@
#include "dir.h"
/* "@(#)suff.c 8.4 (Berkeley) 3/21/94" */
-MAKE_RCSID("$NetBSD: suff.c,v 1.307 2020/11/23 18:07:10 rillig Exp $");
+MAKE_RCSID("$NetBSD: suff.c,v 1.308 2020/11/23 20:41:20 rillig Exp $");
#define SUFF_DEBUG0(text) DEBUG0(SUFF, text)
#define SUFF_DEBUG1(fmt, arg1) DEBUG1(SUFF, fmt, arg1)
@@ -1271,7 +1271,7 @@ ExpandChildren(GNodeListNode *cln, GNode
* on the Arch module to find the nodes for us, expanding
* variables in the parent's context.
*/
- char *sacrifice = cp;
+ char *sacrifice = cp;
(void)Arch_ParseArchive(&sacrifice, members, pgn);
} else {
@@ -1282,8 +1282,8 @@ ExpandChildren(GNodeListNode *cln, GNode
* doesn't understand about variable specifications with
* spaces in them...
*/
- char *start;
- char *initcp = cp; /* For freeing... */
+ char *start;
+ char *initcp = cp; /* For freeing... */
start = cp;
pp_skip_hspace(&start);
Index: src/usr.bin/make/util.c
diff -u src/usr.bin/make/util.c:1.68 src/usr.bin/make/util.c:1.69
--- src/usr.bin/make/util.c:1.68 Mon Nov 16 18:29:49 2020
+++ src/usr.bin/make/util.c Mon Nov 23 20:41:20 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: util.c,v 1.68 2020/11/16 18:29:49 rillig Exp $ */
+/* $NetBSD: util.c,v 1.69 2020/11/23 20:41:20 rillig Exp $ */
/*
* Missing stuff from OS's
@@ -15,7 +15,7 @@
#include "make.h"
-MAKE_RCSID("$NetBSD: util.c,v 1.68 2020/11/16 18:29:49 rillig Exp $");
+MAKE_RCSID("$NetBSD: util.c,v 1.69 2020/11/23 20:41:20 rillig Exp $");
#if !defined(MAKE_NATIVE) && !defined(HAVE_STRERROR)
extern int errno, sys_nerr;
@@ -170,38 +170,38 @@ strrcpy(char *ptr, char *str)
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 */
+ "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/filemon/filemon_ktrace.c
diff -u src/usr.bin/make/filemon/filemon_ktrace.c:1.4 src/usr.bin/make/filemon/filemon_ktrace.c:1.5
--- src/usr.bin/make/filemon/filemon_ktrace.c:1.4 Thu Nov 5 17:27:16 2020
+++ src/usr.bin/make/filemon/filemon_ktrace.c Mon Nov 23 20:41:20 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: filemon_ktrace.c,v 1.4 2020/11/05 17:27:16 rillig Exp $ */
+/* $NetBSD: filemon_ktrace.c,v 1.5 2020/11/23 20:41:20 rillig Exp $ */
/*-
* Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -90,9 +90,9 @@ static filemon_syscall_t *const filemon_
};
struct filemon {
- int ktrfd; /* kernel writes ktrace events here */
- FILE *in; /* we read ktrace events from here */
- FILE *out; /* we write filemon events to here */
+ int ktrfd; /* kernel writes ktrace events here */
+ FILE *in; /* we read ktrace events from here */
+ FILE *out; /* we write filemon events to here */
rb_tree_t active;
pid_t child;
