Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/usr.bin/make make(1): remove trailing whitespace
details: https://anonhg.NetBSD.org/src/rev/0b957e0cc300
branches: trunk
changeset: 1011546:0b957e0cc300
user: rillig <rillig%NetBSD.org@localhost>
date: Fri Jul 03 08:13:23 2020 +0000
description:
make(1): remove trailing whitespace
diffstat:
usr.bin/make/compat.c | 14 +++++++-------
usr.bin/make/cond.c | 16 ++++++++--------
usr.bin/make/dir.c | 32 ++++++++++++++++----------------
usr.bin/make/for.c | 14 +++++++-------
usr.bin/make/job.c | 38 +++++++++++++++++++-------------------
usr.bin/make/job.h | 12 ++++++------
usr.bin/make/main.c | 32 ++++++++++++++++----------------
usr.bin/make/make.c | 16 ++++++++--------
usr.bin/make/meta.c | 40 ++++++++++++++++++++--------------------
usr.bin/make/meta.h | 18 +++++++++---------
usr.bin/make/parse.c | 10 +++++-----
usr.bin/make/trace.c | 8 ++++----
usr.bin/make/util.c | 8 ++++----
usr.bin/make/var.c | 10 +++++-----
14 files changed, 134 insertions(+), 134 deletions(-)
diffs (truncated from 1077 to 300 lines):
diff -r 3c489b80b7db -r 0b957e0cc300 usr.bin/make/compat.c
--- a/usr.bin/make/compat.c Fri Jul 03 08:02:55 2020 +0000
+++ b/usr.bin/make/compat.c Fri Jul 03 08:13:23 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: compat.c,v 1.112 2020/07/03 08:02:55 rillig Exp $ */
+/* $NetBSD: compat.c,v 1.113 2020/07/03 08:13:23 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.112 2020/07/03 08:02:55 rillig Exp $";
+static char rcsid[] = "$NetBSD: compat.c,v 1.113 2020/07/03 08:13:23 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.112 2020/07/03 08:02:55 rillig Exp $");
+__RCSID("$NetBSD: compat.c,v 1.113 2020/07/03 08:13:23 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -233,7 +233,7 @@
silent = gn->type & OP_SILENT;
errCheck = !(gn->type & OP_IGNORE);
doIt = FALSE;
-
+
cmdNode = Lst_Member(gn->commands, cmd);
cmdStart = Var_Subst(NULL, cmd, gn, VARF_WANTRES);
@@ -304,7 +304,7 @@
* go to the shell. Therefore treat '=' and ':' like shell
* meta characters as documented in make(1).
*/
-
+
useShell = needshell(cmd, FALSE);
#endif
@@ -374,7 +374,7 @@
meta_compat_start();
}
#endif
-
+
/*
* Fork and execute the single command. If the fork fails, we abort.
*/
@@ -496,7 +496,7 @@
bmake_signal(compatSigno, SIG_DFL);
kill(myPid, compatSigno);
}
-
+
return status;
}
diff -r 3c489b80b7db -r 0b957e0cc300 usr.bin/make/cond.c
--- a/usr.bin/make/cond.c Fri Jul 03 08:02:55 2020 +0000
+++ b/usr.bin/make/cond.c Fri Jul 03 08:13:23 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cond.c,v 1.77 2020/07/03 08:02:55 rillig Exp $ */
+/* $NetBSD: cond.c,v 1.78 2020/07/03 08:13:23 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.77 2020/07/03 08:02:55 rillig Exp $";
+static char rcsid[] = "$NetBSD: cond.c,v 1.78 2020/07/03 08:13:23 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.77 2020/07/03 08:02:55 rillig Exp $");
+__RCSID("$NetBSD: cond.c,v 1.78 2020/07/03 08:13:23 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -186,7 +186,7 @@
* Indicate when we should be strict about lhs of comparisons.
* TRUE when Cond_EvalExpression is called from Cond_Eval (.if etc)
* FALSE when Cond_EvalExpression is called from var.c:ApplyModifiers
- * since lhs is already expanded and we cannot tell if
+ * since lhs is already expanded and we cannot tell if
* it was a variable reference or not.
*/
static Boolean lhsStrict;
@@ -412,7 +412,7 @@
if (DEBUG(COND)) {
fprintf(debug_file, "exists(%s) result is \"%s\"\n",
arg, path ? path : "");
- }
+ }
if (path != NULL) {
result = TRUE;
free(path);
@@ -666,7 +666,7 @@
rhs = NULL;
lhsFree = rhsFree = FALSE;
lhsQuoted = rhsQuoted = FALSE;
-
+
/*
* Parse the variable spec and skip over it, saving its
* value in lhs.
@@ -709,7 +709,7 @@
goto done;
}
/* For .ifxxx <number> compare against zero */
- if (CondCvtArg(lhs, &left)) {
+ if (CondCvtArg(lhs, &left)) {
t = left != 0.0;
goto done;
}
@@ -762,7 +762,7 @@
* rhs is either a float or an integer. Convert both the
* lhs and the rhs to a double and compare the two.
*/
-
+
if (!CondCvtArg(lhs, &left) || !CondCvtArg(rhs, &right))
goto do_string_compare;
diff -r 3c489b80b7db -r 0b957e0cc300 usr.bin/make/dir.c
--- a/usr.bin/make/dir.c Fri Jul 03 08:02:55 2020 +0000
+++ b/usr.bin/make/dir.c Fri Jul 03 08:13:23 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dir.c,v 1.75 2020/07/03 08:02:55 rillig Exp $ */
+/* $NetBSD: dir.c,v 1.76 2020/07/03 08:13:23 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.75 2020/07/03 08:02:55 rillig Exp $";
+static char rcsid[] = "$NetBSD: dir.c,v 1.76 2020/07/03 08:13:23 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.75 2020/07/03 08:02:55 rillig Exp $");
+__RCSID("$NetBSD: dir.c,v 1.76 2020/07/03 08:13:23 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -112,7 +112,7 @@
* Dir_FindHereOrAbove Search for a path in the current directory and
* then all the directories above it in turn until
* the path is found or we reach the root ("/").
- *
+ *
* Dir_MTime Return the modification time of a node. The file
* is searched for along the default search path.
* The path and mtime fields of the node are filled
@@ -377,7 +377,7 @@
Dir_InitCur(const char *cdname)
{
Path *p;
-
+
if (cdname != NULL) {
/*
* Our build directory is not the same as our source directory.
@@ -480,7 +480,7 @@
Boolean hasLastDot = FALSE; /* true we should search dot last */
Var_Delete(".PATH", VAR_GLOBAL);
-
+
if (Lst_Open(dirSearchPath) == SUCCESS) {
if ((ln = Lst_First(dirSearchPath)) != NULL) {
p = (Path *)Lst_Datum(ln);
@@ -545,7 +545,7 @@
* Dir_HasWildcards --
* see if the given name has any wildcard characters in it
* be careful not to expand unmatching brackets or braces.
- * XXX: This code is not 100% correct. ([^]] fails etc.)
+ * XXX: This code is not 100% correct. ([^]] fails etc.)
* I really don't think that make(1) should be expanding
* patterns, because then you have to set a mechanism for
* escaping the expansion!
@@ -947,7 +947,7 @@
*-----------------------------------------------------------------------
*/
static char *
-DirLookup(Path *p, const char *name MAKE_ATTR_UNUSED, const char *cp,
+DirLookup(Path *p, const char *name MAKE_ATTR_UNUSED, const char *cp,
Boolean hasSlash MAKE_ATTR_UNUSED)
{
char *file; /* the current filename to check */
@@ -1185,7 +1185,7 @@
* is found, we concatenate the directory name and the final
* component and return the resulting string. If we don't find any
* such thing, we go on to phase two...
- *
+ *
* No matter what, we always look for the file in the current
* directory before anywhere else (unless we found the magic
* DOTLAST path, in which case we search it last) and we *do not*
@@ -1409,14 +1409,14 @@
/*-
*-----------------------------------------------------------------------
* Dir_FindHereOrAbove --
- * search for a path starting at a given directory and then working
+ * search for a path starting at a given directory and then working
* our way up towards the root.
*
* Input:
* here starting directory
* search_path the path we are looking for
* result the result of a successful search is placed here
- * rlen the length of the result buffer
+ * rlen the length of the result buffer
* (typically MAXPATHLEN + 1)
*
* Results:
@@ -1426,7 +1426,7 @@
* Side Effects:
*-----------------------------------------------------------------------
*/
-int
+int
Dir_FindHereOrAbove(char *here, char *search_path, char *result, int rlen) {
struct stat st;
@@ -1451,7 +1451,7 @@
try_end = try + strlen(try);
while (try_end > try && *try_end != '/')
try_end--;
- if (try_end > try)
+ if (try_end > try)
*try_end = 0; /* chop! */
}
@@ -1462,7 +1462,7 @@
return 1;
}
- /*
+ /*
* nope, we didn't find it. if we used up dirbase we've
* reached the root and failed.
*/
@@ -1479,7 +1479,7 @@
} /* while (1) */
/*
- * we failed...
+ * we failed...
*/
return 0;
}
@@ -1529,7 +1529,7 @@
* see if we can find it via the current .PATH
*/
cp++;
-
+
fullName = Dir_FindFile(cp, Suff_FindPath(gn));
if (fullName) {
/*
diff -r 3c489b80b7db -r 0b957e0cc300 usr.bin/make/for.c
--- a/usr.bin/make/for.c Fri Jul 03 08:02:55 2020 +0000
+++ b/usr.bin/make/for.c Fri Jul 03 08:13:23 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: for.c,v 1.53 2017/04/16 21:04:44 riastradh Exp $ */
+/* $NetBSD: for.c,v 1.54 2020/07/03 08:13:23 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.53 2017/04/16 21:04:44 riastradh Exp $";
+static char rcsid[] = "$NetBSD: for.c,v 1.54 2020/07/03 08:13:23 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.53 2017/04/16 21:04:44 riastradh Exp $");
+__RCSID("$NetBSD: for.c,v 1.54 2020/07/03 08:13:23 rillig Exp $");
#endif
#endif /* not lint */
Home |
Main Index |
Thread Index |
Old Index