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

Diff for /src/usr.bin/make/parse.c between version 1.23 and 1.24

version 1.23, 1999/11/11 11:40:09 version 1.24, 1999/11/11 11:42:19
Line 137 
Line 137 
  * Definitions for handling #include specifications   * Definitions for handling #include specifications
  */   */
 typedef struct IFile {  typedef struct IFile {
     char           *fname;          /* name of previous file */      char            *fname;         /* name of previous file */
     unsigned long  lineno;          /* saved line number */      unsigned long   lineno;         /* saved line number */
     FILE           *F;              /* the open stream */      FILE            *F;             /* the open stream */
     PTR            *p;              /* the char pointer */      PTR             *p;             /* the char pointer */
 } IFile;  } IFile;
   
 static Lst      includes;       /* stack of IFiles generated by  static Lst      includes;       /* stack of IFiles generated by
Line 1838 
Line 1838 
  *---------------------------------------------------------------------   *---------------------------------------------------------------------
  */   */
 void  void
 Parse_FromString(str)  Parse_FromString(str, newlineno)
     char *str;      char          *str;
       unsigned long newlineno;
 {  {
     IFile         *oldFile;     /* state associated with this file */      IFile         *oldFile;     /* state associated with this file */
   
Line 1857 
Line 1858 
     curFILE = NULL;      curFILE = NULL;
     curPTR = (PTR *) emalloc (sizeof (PTR));      curPTR = (PTR *) emalloc (sizeof (PTR));
     curPTR->str = curPTR->ptr = str;      curPTR->str = curPTR->ptr = str;
     lineno = 0;      lineno = newlineno;
     fname = estrdup(fname);      fname = estrdup(fname);
 }  }
   
Line 2698 
Line 2699 
         (void) Lst_AtEnd (listmain, (ClientData)mainNode);          (void) Lst_AtEnd (listmain, (ClientData)mainNode);
     return (listmain);      return (listmain);
 }  }
   
   unsigned long
   Parse_Getlineno()
   {
       return lineno;
   }
   

Legend:
Removed from v.1.23  
changed lines
  Added in v.1.24