summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2007-09-17 09:44:21 +0000
committerMarc Espie <espie@cvs.openbsd.org>2007-09-17 09:44:21 +0000
commita6237e9b62bb20748d77c73b62ed87c5e10aee6f (patch)
tree58712e4f1b1219a49495c27582c8c546b4f1cb50 /usr.bin
parent0cff0af9568fe7948bf146b4509fc6fd3563615a (diff)
zap more spaces at end of line
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/make/arch.h6
-rw-r--r--usr.bin/make/dir.h4
-rw-r--r--usr.bin/make/garray.h4
-rw-r--r--usr.bin/make/parse.c4
-rw-r--r--usr.bin/make/parsevar.c4
-rw-r--r--usr.bin/make/str.c4
-rw-r--r--usr.bin/make/timestamp.h4
-rw-r--r--usr.bin/make/var.c4
-rw-r--r--usr.bin/make/var.h2
-rw-r--r--usr.bin/make/varmodifiers.c10
10 files changed, 23 insertions, 23 deletions
diff --git a/usr.bin/make/arch.h b/usr.bin/make/arch.h
index cd2a1080389..2377fd48aea 100644
--- a/usr.bin/make/arch.h
+++ b/usr.bin/make/arch.h
@@ -1,7 +1,7 @@
#ifndef ARCH_H
#define ARCH_H
/* $OpenPackages$ */
-/* $OpenBSD: arch.h,v 1.2 2007/09/17 09:28:36 espie Exp $ */
+/* $OpenBSD: arch.h,v 1.3 2007/09/17 09:44:20 espie Exp $ */
/*
* Copyright (c) 2001 Marc Espie.
@@ -60,12 +60,12 @@ extern void Arch_Touch(GNode *);
* This is distinct from Arch_Touch, as it also updates the mtime
* of the library's table of contents. */
extern void Arch_TouchLib(GNode *);
-/* stamp = Arch_MTime(node);
+/* stamp = Arch_MTime(node);
* Find the modification time of a member of an archive *in the
* archive*, and returns it.
* The time is also stored in the member's GNode. */
extern TIMESTAMP Arch_MTime(GNode *);
-/* stamp = Arch_MemMTime(node);
+/* stamp = Arch_MemMTime(node);
* Find the modification time of a member of an archive and returns it.
* To use when the member only exists within the archive. */
extern TIMESTAMP Arch_MemMTime(GNode *);
diff --git a/usr.bin/make/dir.h b/usr.bin/make/dir.h
index 65b9fc66cd0..ec856f6c573 100644
--- a/usr.bin/make/dir.h
+++ b/usr.bin/make/dir.h
@@ -2,7 +2,7 @@
#define DIR_H
/* $OpenPackages$ */
-/* $OpenBSD: dir.h,v 1.22 2007/09/17 09:28:36 espie Exp $ */
+/* $OpenBSD: dir.h,v 1.23 2007/09/17 09:44:20 espie Exp $ */
/* $NetBSD: dir.h,v 1.4 1996/11/06 17:59:05 christos Exp $ */
/*
@@ -143,7 +143,7 @@ extern char *Dir_MakeFlags(const char *, Lst);
/* List of directories to search when looking for targets. */
-extern Lst defaultPath;
+extern Lst defaultPath;
/* communication between dir.c and direxpand.c */
diff --git a/usr.bin/make/garray.h b/usr.bin/make/garray.h
index 388791edff1..0e934800d85 100644
--- a/usr.bin/make/garray.h
+++ b/usr.bin/make/garray.h
@@ -2,7 +2,7 @@
#define GARRAY_H
/* $OpenPackages$ */
-/* $OpenBSD: garray.h,v 1.1 2001/06/12 22:44:21 espie Exp $ */
+/* $OpenBSD: garray.h,v 1.2 2007/09/17 09:44:20 espie Exp $ */
/* Growable array implementation */
/*
@@ -42,7 +42,7 @@ do { \
for (ln = Lst_First((l1)); ln != NULL; ln = Lst_Adv(ln))\
Array_AtEnd((l2), Lst_Datum(ln)); \
} while (0)
-
+
#ifdef STATS_GROW
#define MAY_INCREASE_STATS STAT_GROWARRAY++
#else
diff --git a/usr.bin/make/parse.c b/usr.bin/make/parse.c
index 18db138bce7..227071916e4 100644
--- a/usr.bin/make/parse.c
+++ b/usr.bin/make/parse.c
@@ -1,5 +1,5 @@
/* $OpenPackages$ */
-/* $OpenBSD: parse.c,v 1.86 2007/09/17 09:38:49 espie Exp $ */
+/* $OpenBSD: parse.c,v 1.87 2007/09/17 09:44:20 espie Exp $ */
/* $NetBSD: parse.c,v 1.29 1997/03/10 21:20:04 christos Exp $ */
/*
@@ -1136,7 +1136,7 @@ static char *
resolve_include_filename(const char *file, bool isSystem)
{
char *fullname;
-
+
/* Look up system files on the system path first */
if (isSystem) {
fullname = Dir_FindFileNoDot(file, sysIncPath);
diff --git a/usr.bin/make/parsevar.c b/usr.bin/make/parsevar.c
index 96fe0734673..d7fcb8c005b 100644
--- a/usr.bin/make/parsevar.c
+++ b/usr.bin/make/parsevar.c
@@ -1,5 +1,5 @@
/* $OpenPackages$ */
-/* $OpenBSD: parsevar.c,v 1.10 2007/09/17 09:28:36 espie Exp $ */
+/* $OpenBSD: parsevar.c,v 1.11 2007/09/17 09:44:20 espie Exp $ */
/* $NetBSD: parse.c,v 1.29 1997/03/10 21:20:04 christos Exp $ */
/*
@@ -80,7 +80,7 @@ parse_variable_assignment(const char *line, int ctxt)
#define VAR_APPEND 2
#define VAR_SHELL 4
#define VAR_OPT 8
- int type;
+ int type;
struct Name name;
arg = VarName_Get(line, &name, NULL, true,
diff --git a/usr.bin/make/str.c b/usr.bin/make/str.c
index 81a993d4398..1ded11ededd 100644
--- a/usr.bin/make/str.c
+++ b/usr.bin/make/str.c
@@ -1,5 +1,5 @@
/* $OpenPackages$ */
-/* $OpenBSD: str.c,v 1.24 2007/09/17 09:28:36 espie Exp $ */
+/* $OpenBSD: str.c,v 1.25 2007/09/17 09:44:20 espie Exp $ */
/* $NetBSD: str.c,v 1.13 1996/11/06 17:59:23 christos Exp $ */
/*-
@@ -367,7 +367,7 @@ Str_Matchi(const char *string, const char *estring,
*-----------------------------------------------------------------------
*/
const char *
-Str_SYSVMatch(const char *word, const char *pattern, size_t *len)
+Str_SYSVMatch(const char *word, const char *pattern, size_t *len)
{
const char *p = pattern;
const char *w = word;
diff --git a/usr.bin/make/timestamp.h b/usr.bin/make/timestamp.h
index 10875257247..5423d79620b 100644
--- a/usr.bin/make/timestamp.h
+++ b/usr.bin/make/timestamp.h
@@ -2,7 +2,7 @@
#define TIMESTAMP_H
/* $OpenPackages$ */
-/* $OpenBSD: timestamp.h,v 1.3 2007/09/17 09:28:36 espie Exp $ */
+/* $OpenBSD: timestamp.h,v 1.4 2007/09/17 09:44:20 espie Exp $ */
/*
* Copyright (c) 2001 Marc Espie.
@@ -36,7 +36,7 @@
* ts_set_out_of_date(t): set up t so that it is out-of-date.
* b = is_out_of_date(t): check whether t is out-of-date.
* ts_set_from_stat(s, t): grab date out of stat(2) buffer.
- * b = is_strictly_before(t1, t2):
+ * b = is_strictly_before(t1, t2):
* check whether t1 is before t2.
* stamp = timestamp2time_t(t): extract time_t from timestamp.
* ts_set_from_time_t(d, t): create timestamp from time_t.
diff --git a/usr.bin/make/var.c b/usr.bin/make/var.c
index 7ea2ece2a36..2a89d8ef243 100644
--- a/usr.bin/make/var.c
+++ b/usr.bin/make/var.c
@@ -1,5 +1,5 @@
/* $OpenPackages$ */
-/* $OpenBSD: var.c,v 1.77 2007/09/17 09:28:36 espie Exp $ */
+/* $OpenBSD: var.c,v 1.78 2007/09/17 09:44:20 espie Exp $ */
/* $NetBSD: var.c,v 1.18 1997/03/18 19:24:46 christos Exp $ */
/*
@@ -98,7 +98,7 @@ char var_Error[] = "";
* identical string instances...
*/
static char varNoError[] = "";
-bool errorIsOkay;
+bool errorIsOkay;
static bool checkEnvFirst; /* true if environment should be searched for
* variables before the global context */
diff --git a/usr.bin/make/var.h b/usr.bin/make/var.h
index 44cf2ee4d20..eb17b1b961d 100644
--- a/usr.bin/make/var.h
+++ b/usr.bin/make/var.h
@@ -58,7 +58,7 @@ extern void Var_Appendi_with_ctxt(const char *, const char *,
const char *, int);
#define Var_Append(n, v) Var_Appendi_with_ctxt(n, NULL, v, VAR_GLOBAL)
#define Var_Appendi(n, e, v) Var_Appendi_with_ctxt(n, e, v, VAR_GLOBAL)
-
+
/* Var_Deletei(name, end);
* Deletes a global variable. */
extern void Var_Deletei(const char *, const char *);
diff --git a/usr.bin/make/varmodifiers.c b/usr.bin/make/varmodifiers.c
index 51cd4e1a8af..18dffeb8851 100644
--- a/usr.bin/make/varmodifiers.c
+++ b/usr.bin/make/varmodifiers.c
@@ -1,5 +1,5 @@
/* $OpenPackages$ */
-/* $OpenBSD: varmodifiers.c,v 1.23 2007/09/17 09:28:36 espie Exp $ */
+/* $OpenBSD: varmodifiers.c,v 1.24 2007/09/17 09:44:20 espie Exp $ */
/* $NetBSD: var.c,v 1.18 1997/03/18 19:24:46 christos Exp $ */
/*
@@ -242,7 +242,7 @@ VarModifiers_Init()
choose_mod['D'] = &def_mod;
choose_mod['U'] = &undef_mod;
choose_mod['L'] = &label_mod;
- choose_mod['P'] = &path_mod;
+ choose_mod['P'] = &path_mod;
}
if (FEATURES(FEATURE_ASSIGN))
choose_mod[':'] = &assign_mod;
@@ -431,7 +431,7 @@ NameCompare(const void *ap, const void *bp)
struct Name *a, *b;
size_t n, m;
int c;
-
+
a = (struct Name *)ap;
b = (struct Name *)bp;
n = a->e - a->s;
@@ -1196,7 +1196,7 @@ LoopGrab(const char **s)
*s = p+1;
return escape_dupi(start, p, "@\\");
}
-
+
static void *
get_loop(const char **p, SymTable *ctxt UNUSED, bool err, int endc)
{
@@ -1406,7 +1406,7 @@ VarModifiers_Apply(char *str, const struct Name *name, SymTable *ctxt,
* :lhs=rhs Like :S, but the rhs goes to the end of
* the invocation.
*/
-
+
atstart = true;
while (*tstr != endc && *tstr != '\0') {
struct modifier *mod;