Module Name: src
Committed By: rillig
Date: Sun Nov 29 09:27:40 UTC 2020
Modified Files:
src/usr.bin/make: config.h dir.h hash.h job.c job.h make.h meta.c
pathnames.h
src/usr.bin/make/filemon: filemon.h filemon_dev.c filemon_ktrace.c
Log Message:
make(1): use space instead of tab for preprocessor directives
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/usr.bin/make/config.h
cvs rdiff -u -r1.38 -r1.39 src/usr.bin/make/dir.h
cvs rdiff -u -r1.36 -r1.37 src/usr.bin/make/hash.h
cvs rdiff -u -r1.333 -r1.334 src/usr.bin/make/job.c
cvs rdiff -u -r1.63 -r1.64 src/usr.bin/make/job.h
cvs rdiff -u -r1.229 -r1.230 src/usr.bin/make/make.h
cvs rdiff -u -r1.153 -r1.154 src/usr.bin/make/meta.c
cvs rdiff -u -r1.17 -r1.18 src/usr.bin/make/pathnames.h
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/filemon/filemon.h
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/make/filemon/filemon_dev.c
cvs rdiff -u -r1.7 -r1.8 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/config.h
diff -u src/usr.bin/make/config.h:1.25 src/usr.bin/make/config.h:1.26
--- src/usr.bin/make/config.h:1.25 Mon Oct 19 23:43:55 2020
+++ src/usr.bin/make/config.h Sun Nov 29 09:27:40 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: config.h,v 1.25 2020/10/19 23:43:55 rillig Exp $ */
+/* $NetBSD: config.h,v 1.26 2020/11/29 09:27:40 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -104,7 +104,7 @@
* Is the suffix used to denote libraries and is used by the Suff module
* to find the search path on which to seek any -l<xx> targets.
*/
-#define LIBSUFF ".a"
+#define LIBSUFF ".a"
/*
* RECHECK
@@ -119,7 +119,7 @@
* On systems that don't have this problem, you should define this.
* Under NFS you probably should not, unless you aren't exporting jobs.
*/
-#define RECHECK
+#define RECHECK
/*
* POSIX
Index: src/usr.bin/make/dir.h
diff -u src/usr.bin/make/dir.h:1.38 src/usr.bin/make/dir.h:1.39
--- src/usr.bin/make/dir.h:1.38 Sun Nov 29 08:48:24 2020
+++ src/usr.bin/make/dir.h Sun Nov 29 09:27:40 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: dir.h,v 1.38 2020/11/29 08:48:24 rillig Exp $ */
+/* $NetBSD: dir.h,v 1.39 2020/11/29 09:27:40 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -72,8 +72,8 @@
* from: @(#)dir.h 8.1 (Berkeley) 6/6/93
*/
-#ifndef MAKE_DIR_H
-#define MAKE_DIR_H
+#ifndef MAKE_DIR_H
+#define MAKE_DIR_H
typedef struct CachedDir CachedDir;
@@ -98,8 +98,8 @@ SearchPath *Dir_CopyDirSearchPath(void);
/* Stripped-down variant of struct stat. */
struct cached_stat {
- time_t cst_mtime;
- mode_t cst_mode;
+ time_t cst_mtime;
+ mode_t cst_mode;
};
int cached_lstat(const char *, struct cached_stat *);
Index: src/usr.bin/make/hash.h
diff -u src/usr.bin/make/hash.h:1.36 src/usr.bin/make/hash.h:1.37
--- src/usr.bin/make/hash.h:1.36 Mon Nov 23 18:24:05 2020
+++ src/usr.bin/make/hash.h Sun Nov 29 09:27:40 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: hash.h,v 1.36 2020/11/23 18:24:05 rillig Exp $ */
+/* $NetBSD: hash.h,v 1.37 2020/11/29 09:27:40 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -74,8 +74,8 @@
/* Hash tables with strings as keys and arbitrary pointers as values. */
-#ifndef MAKE_HASH_H
-#define MAKE_HASH_H
+#ifndef MAKE_HASH_H
+#define MAKE_HASH_H
/* A single key-value entry in the hash table. */
typedef struct HashEntry {
Index: src/usr.bin/make/job.c
diff -u src/usr.bin/make/job.c:1.333 src/usr.bin/make/job.c:1.334
--- src/usr.bin/make/job.c:1.333 Sat Nov 28 19:12:28 2020
+++ src/usr.bin/make/job.c Sun Nov 29 09:27:40 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: job.c,v 1.333 2020/11/28 19:12:28 rillig Exp $ */
+/* $NetBSD: job.c,v 1.334 2020/11/29 09:27:40 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.333 2020/11/28 19:12:28 rillig Exp $");
+MAKE_RCSID("$NetBSD: job.c,v 1.334 2020/11/29 09:27:40 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
@@ -395,8 +395,8 @@ static char *targPrefix = NULL; /* What
static Job tokenWaitJob; /* token wait pseudo-job */
static Job childExitJob; /* child exit pseudo-job */
-#define CHILD_EXIT "."
-#define DO_JOB_RESUME "R"
+#define CHILD_EXIT "."
+#define DO_JOB_RESUME "R"
enum { npseudojobs = 2 }; /* number of pseudo-jobs */
Index: src/usr.bin/make/job.h
diff -u src/usr.bin/make/job.h:1.63 src/usr.bin/make/job.h:1.64
--- src/usr.bin/make/job.h:1.63 Sat Nov 14 13:27:01 2020
+++ src/usr.bin/make/job.h Sun Nov 29 09:27:40 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: job.h,v 1.63 2020/11/14 13:27:01 rillig Exp $ */
+/* $NetBSD: job.h,v 1.64 2020/11/29 09:27:40 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -97,8 +97,8 @@ struct emul_pollfd {
short revents;
};
-#define POLLIN 0x0001
-#define POLLOUT 0x0004
+#define POLLIN 0x0001
+#define POLLOUT 0x0004
int
emul_poll(struct pollfd *fd, int nfd, int timeout);
Index: src/usr.bin/make/make.h
diff -u src/usr.bin/make/make.h:1.229 src/usr.bin/make/make.h:1.230
--- src/usr.bin/make/make.h:1.229 Sun Nov 29 01:40:26 2020
+++ src/usr.bin/make/make.h Sun Nov 29 09:27:40 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: make.h,v 1.229 2020/11/29 01:40:26 rillig Exp $ */
+/* $NetBSD: make.h,v 1.230 2020/11/29 09:27:40 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -102,25 +102,25 @@
#endif
#if defined(__GNUC__)
-#define MAKE_GNUC_PREREQ(x, y) \
+#define MAKE_GNUC_PREREQ(x, y) \
((__GNUC__ == (x) && __GNUC_MINOR__ >= (y)) || \
(__GNUC__ > (x)))
#else /* defined(__GNUC__) */
-#define MAKE_GNUC_PREREQ(x, y) 0
+#define MAKE_GNUC_PREREQ(x, y) 0
#endif /* defined(__GNUC__) */
#if MAKE_GNUC_PREREQ(2, 7)
-#define MAKE_ATTR_UNUSED __attribute__((__unused__))
+#define MAKE_ATTR_UNUSED __attribute__((__unused__))
#else
-#define MAKE_ATTR_UNUSED /* delete */
+#define MAKE_ATTR_UNUSED /* delete */
#endif
#if MAKE_GNUC_PREREQ(2, 5)
-#define MAKE_ATTR_DEAD __attribute__((__noreturn__))
+#define MAKE_ATTR_DEAD __attribute__((__noreturn__))
#elif defined(__GNUC__)
-#define MAKE_ATTR_DEAD __volatile
+#define MAKE_ATTR_DEAD __volatile
#else
-#define MAKE_ATTR_DEAD /* delete */
+#define MAKE_ATTR_DEAD /* delete */
#endif
#if MAKE_GNUC_PREREQ(2, 7)
Index: src/usr.bin/make/meta.c
diff -u src/usr.bin/make/meta.c:1.153 src/usr.bin/make/meta.c:1.154
--- src/usr.bin/make/meta.c:1.153 Sat Nov 28 18:55:52 2020
+++ src/usr.bin/make/meta.c Sun Nov 29 09:27:40 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: meta.c,v 1.153 2020/11/28 18:55:52 rillig Exp $ */
+/* $NetBSD: meta.c,v 1.154 2020/11/29 09:27:40 rillig Exp $ */
/*
* Implement 'meta' mode.
@@ -82,7 +82,7 @@ static Boolean metaSilent = FALSE; /* if
extern Boolean forceJobs;
extern char **environ;
-#define MAKE_META_PREFIX ".MAKE.META.PREFIX"
+#define MAKE_META_PREFIX ".MAKE.META.PREFIX"
#ifndef N2U
# define N2U(n, u) (((n) + ((u) - 1)) / (u))
@@ -1712,4 +1712,4 @@ meta_compat_parent(pid_t child)
}
}
-#endif /* USE_META */
+#endif /* USE_META */
Index: src/usr.bin/make/pathnames.h
diff -u src/usr.bin/make/pathnames.h:1.17 src/usr.bin/make/pathnames.h:1.18
--- src/usr.bin/make/pathnames.h:1.17 Sat Apr 11 09:41:18 2009
+++ src/usr.bin/make/pathnames.h Sun Nov 29 09:27:40 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pathnames.h,v 1.17 2009/04/11 09:41:18 apb Exp $ */
+/* $NetBSD: pathnames.h,v 1.18 2020/11/29 09:27:40 rillig Exp $ */
/*
* Copyright (c) 1990, 1993
@@ -39,15 +39,15 @@
#include <paths.h>
#endif
-#define _PATH_OBJDIR "obj"
-#define _PATH_OBJDIRPREFIX "/usr/obj"
+#define _PATH_OBJDIR "obj"
+#define _PATH_OBJDIRPREFIX "/usr/obj"
#ifndef _PATH_DEFSHELLDIR
-#define _PATH_DEFSHELLDIR "/bin"
+#define _PATH_DEFSHELLDIR "/bin"
#endif
-#define _PATH_DEFSYSMK "sys.mk"
+#define _PATH_DEFSYSMK "sys.mk"
#ifndef _PATH_DEFSYSPATH
-#define _PATH_DEFSYSPATH "/usr/share/mk"
+#define _PATH_DEFSYSPATH "/usr/share/mk"
#endif
#ifndef _PATH_TMP
-#define _PATH_TMP "/tmp/" /* with trailing slash */
+#define _PATH_TMP "/tmp/" /* with trailing slash */
#endif
Index: src/usr.bin/make/filemon/filemon.h
diff -u src/usr.bin/make/filemon/filemon.h:1.3 src/usr.bin/make/filemon/filemon.h:1.4
--- src/usr.bin/make/filemon/filemon.h:1.3 Sun Oct 18 11:49:47 2020
+++ src/usr.bin/make/filemon/filemon.h Sun Nov 29 09:27:40 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: filemon.h,v 1.3 2020/10/18 11:49:47 rillig Exp $ */
+/* $NetBSD: filemon.h,v 1.4 2020/11/29 09:27:40 rillig Exp $ */
/*-
* Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#ifndef MAKE_FILEMON_H
-#define MAKE_FILEMON_H
+#define MAKE_FILEMON_H
#include <sys/types.h>
@@ -50,4 +50,4 @@ int filemon_setpid_child(const struct fi
int filemon_readfd(const struct filemon *);
int filemon_process(struct filemon *);
-#endif /* MAKE_FILEMON_H */
+#endif /* MAKE_FILEMON_H */
Index: src/usr.bin/make/filemon/filemon_dev.c
diff -u src/usr.bin/make/filemon/filemon_dev.c:1.5 src/usr.bin/make/filemon/filemon_dev.c:1.6
--- src/usr.bin/make/filemon/filemon_dev.c:1.5 Mon Nov 23 23:41:11 2020
+++ src/usr.bin/make/filemon/filemon_dev.c Sun Nov 29 09:27:40 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: filemon_dev.c,v 1.5 2020/11/23 23:41:11 rillig Exp $ */
+/* $NetBSD: filemon_dev.c,v 1.6 2020/11/29 09:27:40 rillig Exp $ */
/*-
* Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
#endif
#ifndef _PATH_FILEMON
-#define _PATH_FILEMON "/dev/filemon"
+#define _PATH_FILEMON "/dev/filemon"
#endif
struct filemon {
Index: src/usr.bin/make/filemon/filemon_ktrace.c
diff -u src/usr.bin/make/filemon/filemon_ktrace.c:1.7 src/usr.bin/make/filemon/filemon_ktrace.c:1.8
--- src/usr.bin/make/filemon/filemon_ktrace.c:1.7 Sat Nov 28 16:31:34 2020
+++ src/usr.bin/make/filemon/filemon_ktrace.c Sun Nov 29 09:27:40 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: filemon_ktrace.c,v 1.7 2020/11/28 16:31:34 rillig Exp $ */
+/* $NetBSD: filemon_ktrace.c,v 1.8 2020/11/29 09:27:40 rillig Exp $ */
/*-
* Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#define _KERNTYPES /* register_t */
+#define _KERNTYPES /* register_t */
#include "filemon.h"
