INTEGRATION: CWS vgbugs04 (1.2.62); FILE MERGED

2006/07/04 10:37:14 vg 1.2.62.1: #137785# optimize makedepend

soltools/mkdepend/parse.c

@@ -34,11 +34,12 @@ void undefine( char *symbol, register struct inclist *file );
 extern char *directives[];
 extern struct inclist   maininclist;
 
-int find_includes(filep, file, file_red, recursion, failOK)
+int find_includes(filep, file, file_red, recursion, failOK, incCollection)
     struct filepointer  *filep;
     struct inclist      *file, *file_red;
     int         recursion;
     boolean         failOK;
+    struct IncludesCollection* incCollection;
 {
     register char   *line;
     register int    type;
@@ -49,7 +50,7 @@ int find_includes(filep, file, file_red, recursion, failOK)
         case IF:
         doif:
             type = find_includes(filep, file,
-                file_red, recursion+1, failOK);
+                file_red, recursion+1, failOK, incCollection);
             while ((type == ELIF) || (type == ELIFFALSE) ||
                    (type == ELIFGUESSFALSE))
                 type = gobble(filep, file, file_red);
@@ -66,7 +67,7 @@ int find_includes(filep, file, file_red, recursion, failOK)
             type = gobble(filep, file, file_red);
             if (type == ELSE)
                 find_includes(filep, file,
-                      file_red, recursion+1, recfailOK);
+                      file_red, recursion+1, recfailOK, incCollection);
             else
             if (type == ELIF)
                 goto doif;
@@ -83,7 +84,7 @@ int find_includes(filep, file, file_red, recursion, failOK)
                     filep->f_line, line,
                     file->i_file, file_red->i_file, ": doit"));
                 type = find_includes(filep, file,
-                    file_red, recursion+1, failOK);
+                    file_red, recursion+1, failOK, incCollection);
                 while (type == ELIF || type == ELIFFALSE || type == ELIFGUESSFALSE)
                     type = gobble(filep, file, file_red);
                 if (type == ELSE)
@@ -97,7 +98,7 @@ int find_includes(filep, file, file_red, recursion, failOK)
                 type = gobble(filep, file, file_red);
                 if (type == ELSE)
                     find_includes(filep, file,
-                        file_red, recursion+1, failOK);
+                        file_red, recursion + 1, failOK, incCollection);
                 else if (type == ELIF)
                         goto doif;
                 else if (type == ELIFFALSE || type == ELIFGUESSFALSE)
@@ -125,10 +126,10 @@ int find_includes(filep, file, file_red, recursion, failOK)
             undefine(line, file_red);
             break;
         case INCLUDE:
-            add_include(filep, file, file_red, line, FALSE, failOK);
+            add_include(filep, file, file_red, line, FALSE, failOK, incCollection);
             break;
         case INCLUDEDOT:
-            add_include(filep, file, file_red, line, TRUE, failOK);
+            add_include(filep, file, file_red, line, TRUE, failOK, incCollection);
             break;
         case ERROR:
                 warning("%s: %d: %s\n", file_red->i_file,

soltools/mkdepend/pr.c

@@ -39,11 +39,12 @@ extern boolean  printed;
 extern boolean  verbose;
 extern boolean  show_where_not;
 
-void add_include(filep, file, file_red, include, dot, failOK)
+void add_include(filep, file, file_red, include, dot, failOK, incCollection)
     struct filepointer  *filep;
     struct inclist  *file, *file_red;
     char    *include;
     boolean dot;
+    struct IncludesCollection* incCollection;
 {
     register struct inclist *newfile;
     register struct filepointer *content;
@@ -51,7 +52,7 @@ void add_include(filep, file, file_red, include, dot, failOK)
     /*
      * First decide what the pathname of this include file really is.
      */
-    newfile = inc_path(file->i_file, include, dot);
+    newfile = inc_path(file->i_file, include, dot, incCollection);
     if (newfile == NULL) {
         if (failOK)
             return;
@@ -62,7 +63,7 @@ void add_include(filep, file, file_red, include, dot, failOK)
             warning("%s, line %d: ", file->i_file, filep->f_line);
         warning1("cannot find include file \"%s\"\n", include);
         show_where_not = TRUE;
-        newfile = inc_path(file->i_file, include, dot);
+        newfile = inc_path(file->i_file, include, dot, incCollection);
         show_where_not = FALSE;
     }
 
@@ -76,7 +77,7 @@ void add_include(filep, file, file_red, include, dot, failOK)
         if (!newfile->i_searched) {
             newfile->i_searched = TRUE;
             content = getfile(newfile->i_file);
-            find_includes(content, newfile, file_red, 0, failOK);
+            find_includes(content, newfile, file_red, 0, failOK, incCollection);
             freefile(content);
         }
     }