merge from gcc

This commit is contained in:
DJ Delorie
2003-03-17 18:01:07 +00:00
parent 1132738f98
commit f77ed96c7b
4 changed files with 29 additions and 4 deletions

View File

@@ -603,7 +603,7 @@ htab_clear_slot (htab, slot)
argument. */
void
htab_traverse (htab, callback, info)
htab_traverse_noresize (htab, callback, info)
htab_t htab;
htab_trav callback;
PTR info;
@@ -611,9 +611,6 @@ htab_traverse (htab, callback, info)
PTR *slot;
PTR *limit;
if ((htab->n_elements - htab->n_deleted) * 8 < htab->size)
htab_expand (htab);
slot = htab->entries;
limit = slot + htab->size;
@@ -628,6 +625,24 @@ htab_traverse (htab, callback, info)
while (++slot < limit);
}
/* Like htab_traverse_noresize, but does resize the table when it is
too empty to improve effectivity of subsequent calls. */
void
htab_traverse (htab, callback, info)
htab_t htab;
htab_trav callback;
PTR info;
{
PTR *slot;
PTR *limit;
if ((htab->n_elements - htab->n_deleted) * 8 < htab->size)
htab_expand (htab);
htab_traverse_noresize (htab, callback, info);
}
/* Return the current size of given hash table. */
size_t