diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-09-22 07:57:51 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-09-22 07:57:51 +0000 |
| commit | 8f312bbeff81225cda73cb3306cc7532e296d0c9 (patch) | |
| tree | 9db5bfceb0410c5ad6c95c4cbe28657fe9639155 /soltools/mkdepend/parse.c | |
| parent | 325feda30b5c1fd630522ffeb3fce0e18d35ee9d (diff) | |
INTEGRATION: CWS vgbugs04 (1.2.62); FILE MERGED
2006/07/04 10:37:14 vg 1.2.62.1: #137785# optimize makedepend
Diffstat (limited to 'soltools/mkdepend/parse.c')
| -rw-r--r-- | soltools/mkdepend/parse.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/soltools/mkdepend/parse.c b/soltools/mkdepend/parse.c index 6373f9b18eab..307ba07d0b30 100644 --- a/soltools/mkdepend/parse.c +++ b/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, |