From 2d5c66d21e9bec2b5aa610a02eedab60fb5f0aa7 Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Wed, 12 Mar 2003 17:28:10 +0000 Subject: merge from gcc --- libiberty/ChangeLog | 8 ++++++++ libiberty/hashtab.c | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 99ac6ec2903..a45e537f4e2 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,11 @@ +2003-12-03 Jan Hubicka + + * hashtab.c (htab_expand): Fix warning. + + * hashtab.c (htab_expand): Compute the size of hashtable based + on the number of elements actually used. + (htab_traverse): Call htab_expand when table is too empty. + 2003-12-03 Jan Hubicka * hashtab.c (htab_expand): Compute the size of hashtable based diff --git a/libiberty/hashtab.c b/libiberty/hashtab.c index a0cb5a75820..ebaa43b2c50 100644 --- a/libiberty/hashtab.c +++ b/libiberty/hashtab.c @@ -376,8 +376,8 @@ htab_expand (htab) /* Resize only when table after removal of unused elements is either too full or too empty. */ if ((htab->n_elements - htab->n_deleted) * 2 > htab->size - || (htab->n_elements - htab->n_deleted) * 8 < htab->size - && htab->size > 32) + || ((htab->n_elements - htab->n_deleted) * 8 < htab->size + && htab->size > 32)) nsize = higher_prime_number ((htab->n_elements - htab->n_deleted) * 2); else nsize = htab->size; -- cgit v1.2.1