42c42
< __FBSDID("$FreeBSD: head/usr.bin/make/make.c 137606 2004-11-12 08:58:07Z phk $");
---
> __FBSDID("$FreeBSD: head/usr.bin/make/make.c 138232 2004-11-30 17:46:29Z harti $");
95a96
>
111c112
< Make_TimeStamp (GNode *pgn, GNode *cgn)
---
> Make_TimeStamp(GNode *pgn, GNode *cgn)
112a114
>
120c122
< MakeTimeStamp (void *pgn, void *cgn)
---
> MakeTimeStamp(void *pgn, void *cgn)
122c124,125
< return Make_TimeStamp((GNode *) pgn, (GNode *) cgn);
---
>
> return (Make_TimeStamp((GNode *)pgn, (GNode *)cgn));
124c127
< 
---
>
144c147
< Make_OODate (GNode *gn)
---
> Make_OODate(GNode *gn)
152,153c155,156
< if ((gn->type & (OP_JOIN|OP_USE|OP_EXEC)) == 0) {
< (void) Dir_MTime (gn);
---
> if ((gn->type & (OP_JOIN | OP_USE | OP_EXEC)) == 0) {
> Dir_MTime(gn);
189c192
< oodate = Arch_LibOODate (gn) ||
---
> oodate = Arch_LibOODate(gn) ||
241c244
< Lst_ForEach (gn->parents, MakeTimeStamp, (void *)gn);
---
> Lst_ForEach(gn->parents, MakeTimeStamp, (void *)gn);
246c249
< 
---
>
261c264
< MakeAddChild (void *gnp, void *lp)
---
> MakeAddChild(void *gnp, void *lp)
263,264c266,267
< GNode *gn = (GNode *) gnp;
< Lst l = (Lst) lp;
---
> GNode *gn = (GNode *)gnp;
> Lst l = (Lst)lp;
267c270
< (void)Lst_EnQueue (l, (void *)gn);
---
> Lst_EnQueue(l, (void *)gn);
271c274
< 
---
>
296c299
< Make_HandleUse (GNode *cgn, GNode *pgn)
---
> Make_HandleUse(GNode *cgn, GNode *pgn)
307c310
< (void) Lst_Concat (pgn->commands, cgn->commands, LST_CONCNEW);
---
> Lst_Concat(pgn->commands, cgn->commands, LST_CONCNEW);
310,312c313,315
< if (Lst_Open (cgn->children) == SUCCESS) {
< while ((ln = Lst_Next (cgn->children)) != NULL) {
< gn = (GNode *)Lst_Datum (ln);
---
> if (Lst_Open(cgn->children) == SUCCESS) {
> while ((ln = Lst_Next(cgn->children)) != NULL) {
> gn = (GNode *)Lst_Datum(ln);
314,316c317,319
< if (Lst_Member (pgn->children, gn) == NULL) {
< (void) Lst_AtEnd (pgn->children, gn);
< (void) Lst_AtEnd (gn->parents, pgn);
---
> if (Lst_Member(pgn->children, gn) == NULL) {
> Lst_AtEnd(pgn->children, gn);
> Lst_AtEnd(gn->parents, pgn);
320c323
< Lst_Close (cgn->children);
---
> Lst_Close(cgn->children);
323c326
< pgn->type |= cgn->type & ~(OP_OPMASK|OP_USE|OP_TRANSFORM);
---
> pgn->type |= cgn->type & ~(OP_OPMASK | OP_USE | OP_TRANSFORM);
337a341
>
339c343
< MakeHandleUse (void *pgn, void *cgn)
---
> MakeHandleUse(void *pgn, void *cgn)
341c345,346
< return Make_HandleUse((GNode *) pgn, (GNode *) cgn);
---
>
> return (Make_HandleUse((GNode *)pgn, (GNode *)cgn));
343c348
< 
---
>
370c375
< Make_Update (GNode *cgn)
---
> Make_Update(GNode *cgn)
377c382
< cname = Var_Value (TARGET, cgn, &p1);
---
> cname = Var_Value(TARGET, cgn, &p1);
445,447c450,452
< if (Lst_Open (cgn->parents) == SUCCESS) {
< while ((ln = Lst_Next (cgn->parents)) != NULL) {
< pgn = (GNode *)Lst_Datum (ln);
---
> if (Lst_Open(cgn->parents) == SUCCESS) {
> while ((ln = Lst_Next(cgn->parents)) != NULL) {
> pgn = (GNode *)Lst_Datum(ln);
451c456
< if ( ! (cgn->type & (OP_EXEC|OP_USE))) {
---
> if (!(cgn->type & (OP_EXEC | OP_USE))) {
458c463
< (void)Make_TimeStamp (pgn, cgn);
---
> Make_TimeStamp(pgn, cgn);
466c471
< (void)Lst_EnQueue (toBeMade, (void *)pgn);
---
> Lst_EnQueue(toBeMade, (void *)pgn);
468c473
< Error ("Graph cycles through %s", pgn->name);
---
> Error("Graph cycles through %s", pgn->name);
472c477
< Lst_Close (cgn->parents);
---
> Lst_Close(cgn->parents);
486c491
< (void)Lst_EnQueue(toBeMade, (void *)succ);
---
> Lst_EnQueue(toBeMade, (void *)succ);
494c499
< if (Lst_Open (cgn->iParents) == SUCCESS) {
---
> if (Lst_Open(cgn->iParents) == SUCCESS) {
498c503
< while ((ln = Lst_Next (cgn->iParents)) != NULL) {
---
> while ((ln = Lst_Next(cgn->iParents)) != NULL) {
501,502c506,507
< Var_Set (IMPSRC, cname, pgn);
< Var_Set (PREFIX, cpref, pgn);
---
> Var_Set(IMPSRC, cname, pgn);
> Var_Set(PREFIX, cpref, pgn);
506c511
< Lst_Close (cgn->iParents);
---
> Lst_Close(cgn->iParents);
509c514
< 
---
>
531c536
< MakeAddAllSrc (void *cgnp, void *pgnp)
---
> MakeAddAllSrc(void *cgnp, void *pgnp)
535c540,541
< if ((cgn->type & (OP_EXEC|OP_USE|OP_INVISIBLE)) == 0) {
---
>
> if ((cgn->type & (OP_EXEC | OP_USE | OP_INVISIBLE)) == 0) {
547c553
< Var_Append (ALLSRC, child, pgn);
---
> Var_Append(ALLSRC, child, pgn);
577c583
< 
---
>
601c607
< Make_DoAllVar (GNode *gn)
---
> Make_DoAllVar(GNode *gn)
603d608
< Lst_ForEach (gn->children, MakeAddAllSrc, (void *) gn);
604a610,611
> Lst_ForEach(gn->children, MakeAddAllSrc, (void *)gn);
>
606c613
< Var_Set (OODATE, "", gn);
---
> Var_Set(OODATE, "", gn);
609c616
< Var_Set (ALLSRC, "", gn);
---
> Var_Set(ALLSRC, "", gn);
614c621,622
< Var_Set (TARGET, Var_Value (ALLSRC, gn, &p1), gn);
---
>
> Var_Set(TARGET, Var_Value(ALLSRC, gn, &p1), gn);
618c626
< 
---
>
636c644
< MakeStartJobs (void)
---
> MakeStartJobs(void)
641c649
< gn = (GNode *) Lst_DeQueue (toBeMade);
---
> gn = (GNode *)Lst_DeQueue(toBeMade);
670c678
< if (Make_OODate (gn)) {
---
> if (Make_OODate(gn)) {
675,676c683,684
< Make_DoAllVar (gn);
< Job_Make (gn);
---
> Make_DoAllVar(gn);
> Job_Make(gn);
687c695
< Make_DoAllVar (gn);
---
> Make_DoAllVar(gn);
690c698
< Make_Update (gn);
---
> Make_Update(gn);
695c703
< 
---
>
716,717c724,726
< GNode *gn = (GNode *) gnp;
< Boolean cycle = *(Boolean *) cyclep;
---
> GNode *gn = (GNode *)gnp;
> Boolean cycle = *(Boolean *)cyclep;
>
719c728
< printf ("`%s' is up to date.\n", gn->name);
---
> printf("`%s' is up to date.\n", gn->name);
736c745
< Lst_ForEach(gn->children, MakePrintStatus, (void *) &t);
---
> Lst_ForEach(gn->children, MakePrintStatus, (void *)&t);
740c749
< Lst_ForEach(gn->children, MakePrintStatus, (void *) &t);
---
> Lst_ForEach(gn->children, MakePrintStatus, (void *)&t);
743c752
< printf ("`%s' not remade because of errors.\n", gn->name);
---
> printf("`%s' not remade because of errors.\n", gn->name);
748c757
< 
---
>
771c780
< Make_Run (Lst targs)
---
> Make_Run(Lst targs)
777c786
< toBeMade = Lst_Init (FALSE);
---
> toBeMade = Lst_Init(FALSE);
790,791c799,800
< while (!Lst_IsEmpty (examine)) {
< gn = (GNode *) Lst_DeQueue (examine);
---
> while (!Lst_IsEmpty(examine)) {
> gn = (GNode *)Lst_DeQueue(examine);
801,802c810,811
< Lst_ForEach (gn->children, MakeHandleUse, (void *)gn);
< Suff_FindDeps (gn);
---
> Lst_ForEach(gn->children, MakeHandleUse, (void *)gn);
> Suff_FindDeps(gn);
805c814
< Lst_ForEach (gn->children, MakeAddChild, (void *)examine);
---
> Lst_ForEach(gn->children, MakeAddChild, (void *)examine);
807c816
< (void)Lst_EnQueue (toBeMade, (void *)gn);
---
> Lst_EnQueue(toBeMade, (void *)gn);
812c821
< Lst_Destroy (examine, NOFREE);
---
> Lst_Destroy(examine, NOFREE);
829c838
< (void) MakeStartJobs();
---
> MakeStartJobs();
843,845c852,854
< Job_CatchOutput (!Lst_IsEmpty (toBeMade));
< Job_CatchChildren (!usePipes);
< (void)MakeStartJobs();
---
> Job_CatchOutput(!Lst_IsEmpty (toBeMade));
> Job_CatchChildren(!usePipes);
> MakeStartJobs();
855c864
< Lst_ForEach(targs, MakePrintStatus, (void *) &errors);
---
> Lst_ForEach(targs, MakePrintStatus, (void *)&errors);