Module Name: src
Committed By: rillig
Date: Mon Feb 1 21:09:25 UTC 2021
Modified Files:
src/usr.bin/make: job.c make.h
src/usr.bin/make/filemon: filemon_dev.c
Log Message:
make: indent preprocessor directives consistently
As seen in share/misc/style.
To generate a diff of this commit:
cvs rdiff -u -r1.411 -r1.412 src/usr.bin/make/job.c
cvs rdiff -u -r1.248 -r1.249 src/usr.bin/make/make.h
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/make/filemon/filemon_dev.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/job.c
diff -u src/usr.bin/make/job.c:1.411 src/usr.bin/make/job.c:1.412
--- src/usr.bin/make/job.c:1.411 Mon Feb 1 21:04:10 2021
+++ src/usr.bin/make/job.c Mon Feb 1 21:09:25 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: job.c,v 1.411 2021/02/01 21:04:10 rillig Exp $ */
+/* $NetBSD: job.c,v 1.412 2021/02/01 21:09:25 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -142,7 +142,7 @@
#include "trace.h"
/* "@(#)job.c 8.2 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: job.c,v 1.411 2021/02/01 21:04:10 rillig Exp $");
+MAKE_RCSID("$NetBSD: job.c,v 1.412 2021/02/01 21:09:25 rillig Exp $");
/*
* A shell defines how the commands are run. All commands for a target are
@@ -1471,12 +1471,12 @@ JobExec(Job *job, char **argv)
* commit suicide.
*/
#if defined(MAKE_NATIVE) || defined(HAVE_SETPGID)
-# if defined(SYSV)
+# if defined(SYSV)
/* XXX: dsl - I'm sure this should be setpgrp()... */
(void)setsid();
-# else
+# else
(void)setpgid(0, getpid());
-# endif
+# endif
#endif
(void)execv(shellPath, argv);
Index: src/usr.bin/make/make.h
diff -u src/usr.bin/make/make.h:1.248 src/usr.bin/make/make.h:1.249
--- src/usr.bin/make/make.h:1.248 Mon Feb 1 21:04:10 2021
+++ src/usr.bin/make/make.h Mon Feb 1 21:09:25 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: make.h,v 1.248 2021/02/01 21:04:10 rillig Exp $ */
+/* $NetBSD: make.h,v 1.249 2021/02/01 21:09:25 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -521,8 +521,8 @@ extern SearchPath dirSearchPath;
/* Used for .include "...". */
extern SearchPath *parseIncPath;
/*
- * Used for .include <...>, for the built-in sys.mk and makefiles from the
- * command line arguments.
+ * Used for .include <...>, for the built-in sys.mk and for makefiles from
+ * the command line arguments.
*/
extern SearchPath *sysIncPath;
/* The default for sysIncPath. */
@@ -832,18 +832,18 @@ pp_skip_hspace(char **pp)
}
#if defined(lint)
-# define MAKE_RCSID(id) extern void do_not_define_rcsid(void)
+# define MAKE_RCSID(id) extern void do_not_define_rcsid(void)
#elif defined(MAKE_NATIVE)
-# include <sys/cdefs.h>
-# define MAKE_RCSID(id) __RCSID(id)
+# include <sys/cdefs.h>
+# define MAKE_RCSID(id) __RCSID(id)
#elif defined(MAKE_ALL_IN_ONE) && defined(__COUNTER__)
-# define MAKE_RCSID_CONCAT(x, y) CONCAT(x, y)
-# define MAKE_RCSID(id) static volatile char \
+# define MAKE_RCSID_CONCAT(x, y) CONCAT(x, y)
+# define MAKE_RCSID(id) static volatile char \
MAKE_RCSID_CONCAT(rcsid_, __COUNTER__)[] = id
#elif defined(MAKE_ALL_IN_ONE)
-# define MAKE_RCSID(id) extern void do_not_define_rcsid(void)
+# define MAKE_RCSID(id) extern void do_not_define_rcsid(void)
#else
-# define MAKE_RCSID(id) static volatile char rcsid[] = id
+# define MAKE_RCSID(id) static volatile char rcsid[] = id
#endif
#endif /* MAKE_MAKE_H */
Index: src/usr.bin/make/filemon/filemon_dev.c
diff -u src/usr.bin/make/filemon/filemon_dev.c:1.7 src/usr.bin/make/filemon/filemon_dev.c:1.8
--- src/usr.bin/make/filemon/filemon_dev.c:1.7 Tue Jan 19 20:51:46 2021
+++ src/usr.bin/make/filemon/filemon_dev.c Mon Feb 1 21:09:25 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: filemon_dev.c,v 1.7 2021/01/19 20:51:46 rillig Exp $ */
+/* $NetBSD: filemon_dev.c,v 1.8 2021/02/01 21:09:25 rillig Exp $ */
/*
* Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
#include <unistd.h>
#ifdef HAVE_FILEMON_H
-# include <filemon.h>
+# include <filemon.h>
#endif
#ifndef _PATH_FILEMON
