aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDJ Delorie <dj@redhat.com>2003-03-12 17:28:10 +0000
committerDJ Delorie <dj@redhat.com>2003-03-12 17:28:10 +0000
commit2336e177169b6a339fdada43bc3d1ce8173290cd (patch)
treed0992296c1cf63c906e2e0dde456e02243ef23dd
parent8bedc05091d9d4874d382a6c66b7845133f7b5ea (diff)
downloadgdb-2336e177169b6a339fdada43bc3d1ce8173290cd.zip
gdb-2336e177169b6a339fdada43bc3d1ce8173290cd.tar.gz
gdb-2336e177169b6a339fdada43bc3d1ce8173290cd.tar.bz2
merge from gcc
-rw-r--r--libiberty/ChangeLog8
-rw-r--r--libiberty/hashtab.c4
2 files changed, 10 insertions, 2 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 99ac6ec..a45e537 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,5 +1,13 @@
2003-12-03 Jan Hubicka <jh@suse.cz>
+ * 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 <jh@suse.cz>
+
* 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.
diff --git a/libiberty/hashtab.c b/libiberty/hashtab.c
index a0cb5a7..ebaa43b 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;