summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@redhat.com>1993-07-15 01:59:03 +0000
committerRoland McGrath <roland@redhat.com>1993-07-15 01:59:03 +0000
commit7a031cd4b2e057fc9de5124f32dc586f9c2f0a95 (patch)
treed37d44369bf6d95b343b4208f2795943b61679ca
parentfc8fa162531583422e11d6db9794f2b98e639b32 (diff)
downloadgunmake-7a031cd4b2e057fc9de5124f32dc586f9c2f0a95.tar.gz
Formerly variable.c.~23~
-rw-r--r--variable.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/variable.c b/variable.c
index 1004345..2f104ac 100644
--- a/variable.c
+++ b/variable.c
@@ -396,6 +396,7 @@ char **
target_environment (file)
struct file *file;
{
+ struct variable_set_list *set_list;
register struct variable_set_list *s;
struct variable_bucket
{
@@ -410,11 +411,12 @@ target_environment (file)
unsigned int mklev_hash;
if (file == 0)
- s = current_variable_set_list;
+ set_list = current_variable_set_list;
else
- s = file->variables;
+ set_list = file->variables;
/* Find the lowest number of buckets in any set in the list. */
+ s = set_list;
buckets = s->set->buckets;
for (s = s->next; s != 0; s = s->next)
if (s->set->buckets < buckets)
@@ -436,7 +438,7 @@ target_environment (file)
/* Run through all the variable sets in the list,
accumulating variables in TABLE. */
nvariables = 0;
- for (s = file->variables; s != 0; s = s->next)
+ for (s = set_list; s != 0; s = s->next)
{
register struct variable_set *set = s->set;
for (i = 0; i < set->buckets; ++i)