1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
|
--- src/hashtable.c.orig 2016-08-25 17:21:36 UTC
+++ src/hashtable.c
@@ -108,10 +108,10 @@ static int hashtable_do_del(hashtable_t
{
pair_t *pair;
bucket_t *bucket;
- size_t index;
+ size_t idx;
- index = hash & hashmask(hashtable->order);
- bucket = &hashtable->buckets[index];
+ idx = hash & hashmask(hashtable->order);
+ bucket = &hashtable->buckets[idx];
pair = hashtable_find_pair(hashtable, bucket, key, hash);
if(!pair)
@@ -154,7 +154,7 @@ static int hashtable_do_rehash(hashtable
{
list_t *list, *next;
pair_t *pair;
- size_t i, index, new_size, new_order;
+ size_t i, idx, new_size, new_order;
struct hashtable_bucket *new_buckets;
new_order = hashtable->order + 1;
@@ -180,8 +180,8 @@ static int hashtable_do_rehash(hashtable
for(; list != &hashtable->list; list = next) {
next = list->next;
pair = list_to_pair(list);
- index = pair->hash % new_size;
- insert_to_bucket(hashtable, &hashtable->buckets[index], &pair->list);
+ idx = pair->hash % new_size;
+ insert_to_bucket(hashtable, &hashtable->buckets[idx], &pair->list);
}
return 0;
@@ -220,7 +220,7 @@ int hashtable_set(hashtable_t *hashtable
{
pair_t *pair;
bucket_t *bucket;
- size_t hash, index;
+ size_t hash, idx;
/* rehash if the load ratio exceeds 1 */
if(hashtable->size >= hashsize(hashtable->order))
@@ -228,8 +228,8 @@ int hashtable_set(hashtable_t *hashtable
return -1;
hash = hash_str(key);
- index = hash & hashmask(hashtable->order);
- bucket = &hashtable->buckets[index];
+ idx = hash & hashmask(hashtable->order);
+ bucket = &hashtable->buckets[idx];
pair = hashtable_find_pair(hashtable, bucket, key, hash);
if(pair)
|
