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

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

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

version 1.39, 2002/06/15 18:24:57 version 1.40, 2002/12/05 15:56:52
Line 1599  SuffExpandChildren(LstNode prevLN, GNode
Line 1599  SuffExpandChildren(LstNode prevLN, GNode
         }          }
         return(1);          return(1);
     } else if (Dir_HasWildcards(cgn->name)) {      } else if (Dir_HasWildcards(cgn->name)) {
         Lst     exp;        /* List of expansions */          Lst     explist;    /* List of expansions */
         Lst     path;       /* Search path along which to expand */          Lst     path;       /* Search path along which to expand */
         SuffixCmpData sd;   /* Search string data */          SuffixCmpData sd;   /* Search string data */
   
Line 1636  SuffExpandChildren(LstNode prevLN, GNode
Line 1636  SuffExpandChildren(LstNode prevLN, GNode
         /*          /*
          * Expand the word along the chosen path           * Expand the word along the chosen path
          */           */
         exp = Lst_Init(FALSE);          explist = Lst_Init(FALSE);
         Dir_Expand(cgn->name, path, exp);          Dir_Expand(cgn->name, path, explist);
   
         while (!Lst_IsEmpty(exp)) {          while (!Lst_IsEmpty(explist)) {
             /*              /*
              * Fetch next expansion off the list and find its GNode               * Fetch next expansion off the list and find its GNode
              */               */
             cp = (char *)Lst_DeQueue(exp);              cp = (char *)Lst_DeQueue(explist);
   
             if (DEBUG(SUFF)) {              if (DEBUG(SUFF)) {
                 printf("%s...", cp);                  printf("%s...", cp);
Line 1665  SuffExpandChildren(LstNode prevLN, GNode
Line 1665  SuffExpandChildren(LstNode prevLN, GNode
         /*          /*
          * Nuke what's left of the list           * Nuke what's left of the list
          */           */
         Lst_Destroy(exp, NOFREE);          Lst_Destroy(explist, NOFREE);
   
         /*          /*
          * Now the source is expanded, remove it from the list of children to           * Now the source is expanded, remove it from the list of children to

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

CVSweb <webmaster@jp.NetBSD.org>