summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichal Schmidt <mschmidt@redhat.com>2014-10-15 00:36:45 +0200
committerMichal Schmidt <mschmidt@redhat.com>2014-10-23 17:38:02 +0200
commit9700d6980f7c212b10a69399e6430b82a6f45587 (patch)
tree7033b396f438a3446d76c5b1de7cd00ba0a0ad81 /src
parentb3dcf58e283ff1bcb2c1ffacccb158d6e0c271e6 (diff)
hashmap: return more information from resize_buckets()
Return 0 if no resize was needed, 1 if successfully resized and negative on error.
Diffstat (limited to 'src')
-rw-r--r--src/shared/hashmap.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/shared/hashmap.c b/src/shared/hashmap.c
index 1c3a452899..0b456411d5 100644
--- a/src/shared/hashmap.c
+++ b/src/shared/hashmap.c
@@ -369,7 +369,7 @@ static struct hashmap_entry *hash_scan(Hashmap *h, unsigned hash, const void *ke
return NULL;
}
-static bool resize_buckets(Hashmap *h) {
+static int resize_buckets(Hashmap *h) {
struct hashmap_entry **n, *i;
unsigned m;
uint8_t nkey[HASH_KEY_SIZE];
@@ -377,7 +377,7 @@ static bool resize_buckets(Hashmap *h) {
assert(h);
if (_likely_(h->n_entries*4 < h->n_buckets*3))
- return false;
+ return 0;
/* Increase by four */
m = (h->n_entries+1)*4-1;
@@ -385,7 +385,7 @@ static bool resize_buckets(Hashmap *h) {
/* If we hit OOM we simply risk packed hashmaps... */
n = new0(struct hashmap_entry*, m);
if (!n)
- return false;
+ return -ENOMEM;
/* Let's use a different randomized hash key for the
* extension, so that people cannot guess what we are using
@@ -424,7 +424,7 @@ static bool resize_buckets(Hashmap *h) {
memcpy(h->hash_key, nkey, HASH_KEY_SIZE);
- return true;
+ return 1;
}
static int __hashmap_put(Hashmap *h, const void *key, void *value, unsigned hash) {
@@ -432,7 +432,7 @@ static int __hashmap_put(Hashmap *h, const void *key, void *value, unsigned hash
struct hashmap_entry *e;
- if (resize_buckets(h))
+ if (resize_buckets(h) > 0)
hash = bucket_hash(h, key);
if (h->from_pool)