merge from gcc

This commit is contained in:
DJ Delorie 2003-01-20 19:03:56 +00:00
parent 571fe01fe0
commit eed2b28c05
2 changed files with 8 additions and 2 deletions

View File

@ -1,3 +1,7 @@
2003-01-20 Josef Zlomek <zlomekj@suse.cz>
* hashtab.c (htab_expand): Fix allocation of new entries.
2003-01-09 Christian Cornelssen <ccorn@cs.tu-berlin.de>
* Makefile.in (FLAGS_TO_PASS): Also pass DESTDIR.

View File

@ -306,16 +306,18 @@ htab_expand (htab)
PTR *olimit;
PTR *p;
PTR *nentries;
size_t nsize;
oentries = htab->entries;
olimit = oentries + htab->size;
htab->size = higher_prime_number (htab->size * 2);
nsize = higher_prime_number (htab->size * 2);
nentries = (PTR *) (*htab->alloc_f) (htab->size, sizeof (PTR *));
nentries = (PTR *) (*htab->alloc_f) (nsize, sizeof (PTR));
if (nentries == NULL)
return 0;
htab->entries = nentries;
htab->size = nsize;
htab->n_elements -= htab->n_deleted;
htab->n_deleted = 0;