diff options
Diffstat (limited to 'usr.bin/make/suff.c')
| -rw-r--r-- | usr.bin/make/suff.c | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/usr.bin/make/suff.c b/usr.bin/make/suff.c index e6665dadec132..ccf137ecd87ce 100644 --- a/usr.bin/make/suff.c +++ b/usr.bin/make/suff.c @@ -414,19 +414,19 @@ SuffInsert (l, s) } Lst_Close (l); - DEBUGF(SUFF, "inserting %s(%d)...", s->name, s->sNum); + DEBUGF(SUFF, ("inserting %s(%d)...", s->name, s->sNum)); if (ln == NULL) { - DEBUGF(SUFF, "at end of list\n"); + DEBUGF(SUFF, ("at end of list\n")); (void)Lst_AtEnd (l, (void *)s); s->refCount++; (void)Lst_AtEnd(s->ref, (void *) l); } else if (s2->sNum != s->sNum) { - DEBUGF(SUFF, "before %s(%d)\n", s2->name, s2->sNum); + DEBUGF(SUFF, ("before %s(%d)\n", s2->name, s2->sNum)); (void)Lst_Insert (l, ln, (void *)s); s->refCount++; (void)Lst_AtEnd(s->ref, (void *) l); } else { - DEBUGF(SUFF, "already there\n"); + DEBUGF(SUFF, ("already there\n")); } } @@ -619,8 +619,8 @@ Suff_AddTransform (line) /* * link the two together in the proper relationship and order */ - DEBUGF(SUFF, "defining transformation from `%s' to `%s'\n", - s->name, t->name); + DEBUGF(SUFF, ("defining transformation from `%s' to `%s'\n", + s->name, t->name)); SuffInsert (t->children, s); SuffInsert (s->parents, t); @@ -658,8 +658,8 @@ Suff_EndTransform(gnp, dummy) (void)SuffParseTransform(gn->name, &s, &t); - DEBUGF(SUFF, "deleting transformation from `%s' to `%s'\n", - s->name, t->name); + DEBUGF(SUFF, ("deleting transformation from `%s' to `%s'\n", + s->name, t->name)); /* * Remove the source from the target's children list. We check for a @@ -676,7 +676,7 @@ Suff_EndTransform(gnp, dummy) */ SuffRemove(s->parents, t); } else if (gn->type & OP_TRANSFORM) { - DEBUGF(SUFF, "transformation %s complete\n", gn->name); + DEBUGF(SUFF, ("transformation %s complete\n", gn->name)); } return(dummy ? 0 : 0); @@ -1150,7 +1150,7 @@ SuffFindThem (srcs, slst) while (!Lst_IsEmpty (srcs)) { s = (Src *) Lst_DeQueue (srcs); - DEBUGF(SUFF, "\ttrying %s...", s->file); + DEBUGF(SUFF, ("\ttrying %s...", s->file)); /* * A file is considered to exist if either a node exists in the @@ -1173,14 +1173,14 @@ SuffFindThem (srcs, slst) break; } - DEBUGF(SUFF, "not there\n"); + DEBUGF(SUFF, ("not there\n")); SuffAddLevel (srcs, s); Lst_AtEnd(slst, (void *) s); } if (rs) { - DEBUGF(SUFF, "got it\n"); + DEBUGF(SUFF, ("got it\n")); } return (rs); } @@ -1266,7 +1266,7 @@ SuffFindCmds (targ, slst) Lst_AtEnd(targ->cp, (void *) ret); #endif Lst_AtEnd(slst, (void *) ret); - DEBUGF(SUFF, "\tusing existing source %s\n", s->name); + DEBUGF(SUFF, ("\tusing existing source %s\n", s->name)); return (ret); } } @@ -1317,7 +1317,7 @@ SuffExpandChildren(cgnp, pgnp) * the children list. */ if (strchr(cgn->name, '$') != (char *)NULL) { - DEBUGF(SUFF, "Expanding \"%s\"...", cgn->name); + DEBUGF(SUFF, ("Expanding \"%s\"...", cgn->name)); cp = Var_Subst(NULL, cgn->name, pgn, TRUE); if (cp != (char *)NULL) { @@ -1406,7 +1406,7 @@ SuffExpandChildren(cgnp, pgnp) while(!Lst_IsEmpty(members)) { gn = (GNode *)Lst_DeQueue(members); - DEBUGF(SUFF, "%s...", gn->name); + DEBUGF(SUFF, ("%s...", gn->name)); if (Lst_Member(pgn->children, (void *)gn) == NULL) { (void)Lst_Append(pgn->children, prevLN, (void *)gn); prevLN = Lst_Succ(prevLN); @@ -1427,7 +1427,7 @@ SuffExpandChildren(cgnp, pgnp) ln = Lst_Member(pgn->children, (void *)cgn); pgn->unmade--; Lst_Remove(pgn->children, ln); - DEBUGF(SUFF, "\n"); + DEBUGF(SUFF, ("\n")); } else if (Dir_HasWildcards(cgn->name)) { Lst exp; /* List of expansions */ Lst path; /* Search path along which to expand */ @@ -1443,12 +1443,12 @@ SuffExpandChildren(cgnp, pgnp) cp = cgn->name + strlen(cgn->name); ln = Lst_Find(sufflist, (void *)cp, SuffSuffIsSuffixP); - DEBUGF(SUFF, "Wildcard expanding \"%s\"...", cgn->name); + DEBUGF(SUFF, ("Wildcard expanding \"%s\"...", cgn->name)); if (ln != NULL) { Suff *s = (Suff *)Lst_Datum(ln); - DEBUGF(SUFF, "suffix is \"%s\"...", s->name); + DEBUGF(SUFF, ("suffix is \"%s\"...", s->name)); path = s->searchPath; } else { /* @@ -1469,7 +1469,7 @@ SuffExpandChildren(cgnp, pgnp) */ cp = (char *)Lst_DeQueue(exp); - DEBUGF(SUFF, "%s...", cp); + DEBUGF(SUFF, ("%s...", cp)); gn = Targ_FindNode(cp, TARG_CREATE); /* @@ -1496,7 +1496,7 @@ SuffExpandChildren(cgnp, pgnp) ln = Lst_Member(pgn->children, (void *)cgn); pgn->unmade--; Lst_Remove(pgn->children, ln); - DEBUGF(SUFF, "\n"); + DEBUGF(SUFF, ("\n")); } return(0); @@ -1580,7 +1580,7 @@ SuffApplyTransform(tGn, sGn, t, s) gn = (GNode *)Lst_Datum(ln); - DEBUGF(SUFF, "\tapplying %s -> %s to \"%s\"\n", s->name, t->name, tGn->name); + DEBUGF(SUFF, ("\tapplying %s -> %s to \"%s\"\n", s->name, t->name, tGn->name)); /* * Record last child for expansion purposes @@ -1686,7 +1686,7 @@ SuffFindArchiveDeps(gn, slst) /* * Didn't know what it was -- use .NULL suffix if not in make mode */ - DEBUGF(SUFF, "using null suffix\n"); + DEBUGF(SUFF, ("using null suffix\n")); ms = suffNull; } @@ -1716,8 +1716,8 @@ SuffFindArchiveDeps(gn, slst) * Got one -- apply it */ if (!SuffApplyTransform(gn, mem, (Suff *)Lst_Datum(ln), ms)) { - DEBUGF(SUFF, "\tNo transformation from %s -> %s\n", - ms->name, ((Suff *)Lst_Datum(ln))->name); + DEBUGF(SUFF, ("\tNo transformation from %s -> %s\n", + ms->name, ((Suff *)Lst_Datum(ln))->name)); } } } @@ -1859,7 +1859,7 @@ SuffFindNormalDeps(gn, slst) * Handle target of unknown suffix... */ if (Lst_IsEmpty(targs) && suffNull != NULL) { - DEBUGF(SUFF, "\tNo known suffix on %s. Using .NULL suffix\n", gn->name); + DEBUGF(SUFF, ("\tNo known suffix on %s. Using .NULL suffix\n", gn->name)); targ = (Src *)emalloc(sizeof (Src)); targ->file = estrdup(gn->name); @@ -1880,10 +1880,10 @@ SuffFindNormalDeps(gn, slst) if (Lst_IsEmpty(gn->commands) && Lst_IsEmpty(gn->children)) SuffAddLevel(srcs, targ); else { - DEBUGF(SUFF, "not "); + DEBUGF(SUFF, ("not ")); } - DEBUGF(SUFF, "adding suffix rules\n"); + DEBUGF(SUFF, ("adding suffix rules\n")); (void)Lst_AtEnd(targs, (void *)targ); } @@ -1931,7 +1931,7 @@ SuffFindNormalDeps(gn, slst) Lst_ForEach(gn->children, SuffExpandChildren, (void *)gn); if (targ == NULL) { - DEBUGF(SUFF, "\tNo valid suffix on %s\n", gn->name); + DEBUGF(SUFF, ("\tNo valid suffix on %s\n", gn->name)); sfnd_abort: /* @@ -2174,7 +2174,7 @@ SuffFindDeps (gn, slst) gn->type |= OP_DEPS_FOUND; } - DEBUGF(SUFF, "SuffFindDeps (%s)\n", gn->name); + DEBUGF(SUFF, ("SuffFindDeps (%s)\n", gn->name)); if (gn->type & OP_ARCHV) { SuffFindArchiveDeps(gn, slst); |
