summaryrefslogtreecommitdiff
path: root/usr.bin/make/make.c
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2005-07-25 22:55:58 +0000
committerchristos <christos@NetBSD.org>2005-07-25 22:55:58 +0000
commit3692d77541719fcf01cd0767f047ec48db1a5eba (patch)
treed27c36361ad666a23b1503410d1a3da7b39d28f7 /usr.bin/make/make.c
parentc3414672de892161e24b25495c8512650cd9d90a (diff)
Whitespace KNF cleanup from Max Okumoto
Diffstat (limited to 'usr.bin/make/make.c')
-rw-r--r--usr.bin/make/make.c52
1 files changed, 26 insertions, 26 deletions
diff --git a/usr.bin/make/make.c b/usr.bin/make/make.c
index b056553376e..92c7d999403 100644
--- a/usr.bin/make/make.c
+++ b/usr.bin/make/make.c
@@ -1,4 +1,4 @@
-/* $NetBSD: make.c,v 1.56 2005/02/16 15:11:52 christos Exp $ */
+/* $NetBSD: make.c,v 1.57 2005/07/25 22:55:58 christos Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: make.c,v 1.56 2005/02/16 15:11:52 christos Exp $";
+static char rcsid[] = "$NetBSD: make.c,v 1.57 2005/07/25 22:55:58 christos Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)make.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: make.c,v 1.56 2005/02/16 15:11:52 christos Exp $");
+__RCSID("$NetBSD: make.c,v 1.57 2005/07/25 22:55:58 christos Exp $");
#endif
#endif /* not lint */
#endif
@@ -208,12 +208,12 @@ Make_OODate(GNode *gn)
* doesn't depend on their modification time...
*/
if ((gn->type & (OP_JOIN|OP_USE|OP_USEBEFORE|OP_EXEC)) == 0) {
- (void) Dir_MTime(gn);
+ (void)Dir_MTime(gn);
if (DEBUG(MAKE)) {
if (gn->mtime != 0) {
- printf ("modified %s...", Targ_FmtTime(gn->mtime));
+ printf("modified %s...", Targ_FmtTime(gn->mtime));
} else {
- printf ("non-existent...");
+ printf("non-existent...");
}
}
}
@@ -355,7 +355,7 @@ MakeAddChild(ClientData gnp, ClientData lp)
Lst l = (Lst) lp;
if ((gn->flags & REMAKE) == 0 && !(gn->type & (OP_USE|OP_USEBEFORE))) {
- (void)Lst_EnQueue (l, (ClientData)gn);
+ (void)Lst_EnQueue(l, (ClientData)gn);
}
return (0);
}
@@ -383,7 +383,7 @@ MakeFindChild(ClientData gnp, ClientData pgnp)
GNode *gn = (GNode *) gnp;
GNode *pgn = (GNode *) pgnp;
- (void) Dir_MTime(gn);
+ (void)Dir_MTime(gn);
Make_TimeStamp(pgn, gn);
pgn->unmade--;
@@ -435,20 +435,20 @@ Make_HandleUse(GNode *cgn, GNode *pgn)
*/
Lst cmds = pgn->commands;
pgn->commands = Lst_Duplicate(cgn->commands, NOCOPY);
- (void) Lst_Concat(pgn->commands, cmds, LST_CONCNEW);
+ (void)Lst_Concat(pgn->commands, cmds, LST_CONCNEW);
Lst_Destroy(cmds, NOFREE);
} else {
/*
* .USE or target has no commands --
* append the child's commands to the parent.
*/
- (void) Lst_Concat(pgn->commands, cgn->commands, LST_CONCNEW);
+ (void)Lst_Concat(pgn->commands, cgn->commands, LST_CONCNEW);
}
}
if (Lst_Open(cgn->children) == SUCCESS) {
while ((ln = Lst_Next(cgn->children)) != NILLNODE) {
- GNode *tgn, *gn = (GNode *)Lst_Datum (ln);
+ GNode *tgn, *gn = (GNode *)Lst_Datum(ln);
/*
* Expand variables in the .USE node's name
@@ -470,8 +470,8 @@ Make_HandleUse(GNode *cgn, GNode *pgn)
gn = tgn;
}
- (void) Lst_AtEnd(pgn->children, gn);
- (void) Lst_AtEnd(gn->parents, pgn);
+ (void)Lst_AtEnd(pgn->children, gn);
+ (void)Lst_AtEnd(gn->parents, pgn);
pgn->unmade += 1;
}
Lst_Close(cgn->children);
@@ -695,7 +695,7 @@ Make_Update(GNode *cgn)
}
if (Lst_Open(parents) == SUCCESS) {
while ((ln = Lst_Next(parents)) != NILLNODE) {
- pgn = (GNode *)Lst_Datum (ln);
+ pgn = (GNode *)Lst_Datum(ln);
if (mtime == 0)
pgn->flags |= FORCE;
/*
@@ -709,7 +709,7 @@ Make_Update(GNode *cgn)
if ( ! (cgn->type & (OP_EXEC|OP_USE|OP_USEBEFORE))) {
if (cgn->made == MADE)
pgn->flags |= CHILDMADE;
- (void)Make_TimeStamp (pgn, cgn);
+ (void)Make_TimeStamp(pgn, cgn);
}
/*
@@ -726,7 +726,7 @@ Make_Update(GNode *cgn)
* Queue the node up -- any unmade predecessors will
* be dealt with in MakeStartJobs.
*/
- (void)Lst_EnQueue (toBeMade, (ClientData)pgn);
+ (void)Lst_EnQueue(toBeMade, (ClientData)pgn);
} else if (pgn->unmade < 0) {
Error("Graph cycles through %s", pgn->name);
}
@@ -759,7 +759,7 @@ Make_Update(GNode *cgn)
char *cpref = Var_Value(PREFIX, cgn, &p1);
while ((ln = Lst_Next(cgn->iParents)) != NILLNODE) {
- pgn = (GNode *)Lst_Datum (ln);
+ pgn = (GNode *)Lst_Datum(ln);
if (pgn->flags & REMAKE) {
Var_Set(IMPSRC, cname, pgn, 0);
if (cpref != NULL)
@@ -933,9 +933,9 @@ MakeStartJobs(void)
GNode *gn;
while (!Lst_IsEmpty (toBeMade)) {
- gn = (GNode *) Lst_DeQueue(toBeMade);
+ gn = (GNode *)Lst_DeQueue(toBeMade);
if (DEBUG(MAKE)) {
- printf ("Examining %s...", gn->name);
+ printf("Examining %s...", gn->name);
}
/*
* Make sure any and all predecessors that are going to be made,
@@ -974,7 +974,7 @@ MakeStartJobs(void)
numNodes--;
if (Make_OODate(gn)) {
if (DEBUG(MAKE)) {
- printf ("out-of-date\n");
+ printf("out-of-date\n");
}
if (queryFlag) {
return (TRUE);
@@ -983,7 +983,7 @@ MakeStartJobs(void)
Job_Make(gn);
} else {
if (DEBUG(MAKE)) {
- printf ("up-to-date\n");
+ printf("up-to-date\n");
}
gn->made = UPTODATE;
if (gn->type & OP_JOIN) {
@@ -1029,7 +1029,7 @@ MakePrintStatus(ClientData gnp, ClientData cyclep)
GNode *gn = (GNode *) gnp;
Boolean cycle = *(Boolean *) cyclep;
if (gn->made == UPTODATE) {
- printf ("`%s' is up to date.\n", gn->name);
+ printf("`%s' is up to date.\n", gn->name);
} else if (gn->unmade != 0) {
if (cycle) {
Boolean t = TRUE;
@@ -1053,7 +1053,7 @@ MakePrintStatus(ClientData gnp, ClientData cyclep)
Lst_ForEach(gn->children, MakePrintStatus, (ClientData) &t);
}
} else {
- printf ("`%s' not remade because of errors.\n", gn->name);
+ printf("`%s' not remade because of errors.\n", gn->name);
}
}
return (0);
@@ -1096,7 +1096,7 @@ Make_ExpandUse(Lst targs)
* and go on about our business.
*/
while (!Lst_IsEmpty (examine)) {
- gn = (GNode *) Lst_DeQueue(examine);
+ gn = (GNode *)Lst_DeQueue(examine);
if ((gn->type & OP_DOUBLEDEP) && !Lst_IsEmpty (gn->cohorts)) {
Lst new;
@@ -1147,7 +1147,7 @@ Make_ExpandUse(Lst targs)
if (gn->unmade != 0) {
Lst_ForEach(gn->children, MakeAddChild, (ClientData)examine);
} else {
- (void)Lst_EnQueue (ntargs, (ClientData)gn);
+ (void)Lst_EnQueue(ntargs, (ClientData)gn);
}
}
}
@@ -1202,7 +1202,7 @@ Make_Run(Lst targs)
* the finishing of a job. So we fill the Job table as much as we can
* before going into our loop.
*/
- (void) MakeStartJobs();
+ (void)MakeStartJobs();
}
/*