Skip to content

Commit 72ea5b2

Browse files
committed
ets: rename params
Signed-off-by: Jakub Gonet <jakub.gonet@swmansion.com>
1 parent d791640 commit 72ea5b2

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

src/libAtomVM/ets_hashtable.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ static void print_info(struct EtsHashTable *hash_table)
8787
}
8888
#endif
8989

90-
struct HNode *ets_hashtable_new_node(term entry, int keypos)
90+
struct HNode *ets_hashtable_new_node(term entry, int key_index)
9191
{
9292
struct HNode *new_node = malloc(sizeof(struct HNode));
9393
if (IS_NULL_PTR(new_node)) {
@@ -101,8 +101,8 @@ struct HNode *ets_hashtable_new_node(term entry, int keypos)
101101

102102
term new_entry = memory_copy_term_tree(&new_node->heap, entry);
103103
assert(term_is_tuple(new_entry));
104-
assert(term_get_tuple_arity(new_entry) >= keypos);
105-
term key = term_get_tuple_element(new_entry, keypos);
104+
assert(term_get_tuple_arity(new_entry) >= key_index);
105+
term key = term_get_tuple_element(new_entry, key_index);
106106

107107
new_node->next = NULL;
108108
new_node->key = key;
@@ -167,14 +167,14 @@ EtsHashtableStatus ets_hashtable_insert(struct EtsHashTable *hash_table, struct
167167
return EtsHashtableOk;
168168
}
169169

170-
term ets_hashtable_lookup(struct EtsHashTable *hash_table, term key, size_t keypos, GlobalContext *global)
170+
term ets_hashtable_lookup(struct EtsHashTable *hash_table, term key, size_t key_index, GlobalContext *global)
171171
{
172172
uint32_t hash = hash_term(key, global);
173173
uint32_t index = hash % hash_table->capacity;
174174

175175
const struct HNode *node = hash_table->buckets[index];
176176
while (node) {
177-
term key_to_compare = term_get_tuple_element(node->entry, keypos);
177+
term key_to_compare = term_get_tuple_element(node->entry, key_index);
178178
if (term_compare(key, key_to_compare, TermCompareExact, global) == TermEquals) {
179179
return node->entry;
180180
}
@@ -184,15 +184,15 @@ term ets_hashtable_lookup(struct EtsHashTable *hash_table, term key, size_t keyp
184184
return term_nil();
185185
}
186186

187-
bool ets_hashtable_remove(struct EtsHashTable *hash_table, term key, size_t keypos, GlobalContext *global)
187+
bool ets_hashtable_remove(struct EtsHashTable *hash_table, term key, size_t key_index, GlobalContext *global)
188188
{
189189
uint32_t hash = hash_term(key, global);
190190
uint32_t index = hash % hash_table->capacity;
191191

192192
struct HNode *node = hash_table->buckets[index];
193193
struct HNode *prev_node = NULL;
194194
while (node) {
195-
term key_to_compare = term_get_tuple_element(node->entry, keypos);
195+
term key_to_compare = term_get_tuple_element(node->entry, key_index);
196196
if (term_compare(key, key_to_compare, TermCompareExact, global) == TermEquals) {
197197
struct HNode *next_node = node->next;
198198
ets_hashtable_free_node(node, global);

src/libAtomVM/ets_hashtable.h

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,13 @@ typedef enum EtsHashtableStatus
5252
struct EtsHashTable *ets_hashtable_new();
5353
void ets_hashtable_destroy(struct EtsHashTable *hash_table, GlobalContext *global);
5454

55-
EtsHashtableStatus ets_hashtable_insert(struct EtsHashTable *hash_table, struct HNode *new_node, EtsHashtableOptions opts, GlobalContext *global);
56-
term ets_hashtable_lookup(struct EtsHashTable *hash_table, term key, size_t keypos, GlobalContext *global);
57-
bool ets_hashtable_remove(struct EtsHashTable *hash_table, term key, size_t keypos, GlobalContext *global);
58-
struct HNode *ets_hashtable_new_node(term entry, int keypos);
55+
struct HNode *ets_hashtable_new_node(term entry, int key_index);
5956
void ets_hashtable_free_node(struct HNode *node, GlobalContext *global);
6057

58+
EtsHashtableStatus ets_hashtable_insert(struct EtsHashTable *hash_table, struct HNode *new_node, EtsHashtableOptions opts, GlobalContext *global);
59+
term ets_hashtable_lookup(struct EtsHashTable *hash_table, term key, size_t key_index, GlobalContext *global);
60+
bool ets_hashtable_remove(struct EtsHashTable *hash_table, term key, size_t key_index, GlobalContext *global);
61+
6162
#ifdef __cplusplus
6263
}
6364
#endif

0 commit comments

Comments
 (0)