[BACK]Return to suff.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / make

Diff for /src/usr.bin/make/suff.c between version 1.38 and 1.39

version 1.38, 2000/09/14 13:46:45 version 1.39, 2000/11/22 17:22:28
Line 1460 
Line 1460 
     Suff        *s;         /* Source suffix */      Suff        *s;         /* Source suffix */
 {  {
     LstNode     ln;         /* General node */      LstNode     ln;         /* General node */
       LstNode     np;         /* Next node for loop */
     char        *tname;     /* Name of transformation rule */      char        *tname;     /* Name of transformation rule */
     GNode       *gn;        /* Node for same */      GNode       *gn;        /* Node for same */
   
Line 1529 
Line 1530 
     /*      /*
      * Deal with wildcards and variables in any acquired sources       * Deal with wildcards and variables in any acquired sources
      */       */
     ln = Lst_Succ(ln);      for (ln = Lst_Succ(ln); ln != NULL; ln = np) {
     Lst_ForEachFrom(ln, SuffExpandChildren, tGn);          np = Lst_Adv(ln);
           SuffExpandChildren(Lst_Datum(ln), tGn);
       }
   
     /*      /*
      * Keep track of another parent to which this beast is transformed so       * Keep track of another parent to which this beast is transformed so
Line 1691 
Line 1694 
     char        *eoname;    /* End of name */      char        *eoname;    /* End of name */
     char        *sopref;    /* Start of prefix */      char        *sopref;    /* Start of prefix */
     LstNode     ln;         /* Next suffix node to check */      LstNode     ln;         /* Next suffix node to check */
       LstNode     np;
     LIST        srcs;       /* List of sources at which to look */      LIST        srcs;       /* List of sources at which to look */
     LIST        targs;      /* List of targets to which things can be      LIST        targs;      /* List of targets to which things can be
                              * transformed. They all have the same file,                               * transformed. They all have the same file,
Line 1849 
Line 1853 
      * Now we've got the important local variables set, expand any sources       * Now we've got the important local variables set, expand any sources
      * that still contain variables or wildcards in their names.       * that still contain variables or wildcards in their names.
      */       */
     Lst_ForEach(&gn->children, SuffExpandChildren, gn);      for (ln = Lst_First(&gn->children); ln != NULL; ln = np) {
           np = Lst_Adv(ln);
           SuffExpandChildren(Lst_Datum(ln), gn);
       }
   
     if (targ == NULL) {      if (targ == NULL) {
         if (DEBUG(SUFF)) {          if (DEBUG(SUFF)) {

Legend:
Removed from v.1.38  
changed lines
  Added in v.1.39