Skip to content

Commit c804e42

Browse files
committed
ets: rename entry to tuple in insert
Signed-off-by: Jakub Gonet <jakub.gonet@swmansion.com>
1 parent 72ea5b2 commit c804e42

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

src/libAtomVM/ets.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -247,21 +247,22 @@ static void ets_delete_all_tables(struct Ets *ets, GlobalContext *global)
247247
ets_delete_tables_internal(ets, true_pred, NULL, global);
248248
}
249249

250-
static EtsErrorCode insert(struct EtsTable *ets_table, term entry, Context *ctx)
250+
static EtsErrorCode insert(struct EtsTable *ets_table, term tuple, Context *ctx)
251251
{
252-
size_t keypos = ets_table->key_index;
253-
254-
if ((size_t) term_get_tuple_arity(entry) <= keypos) {
252+
assert(term_is_tuple(tuple));
253+
size_t key_index = ets_table->key_index;
254+
if ((size_t) term_get_tuple_arity(tuple) <= key_index) {
255255
return EtsBadEntry;
256256
}
257257

258-
struct HNode *new_node = ets_hashtable_new_node(entry, keypos);
258+
struct HNode *new_node = ets_hashtable_new_node(tuple, key_index);
259259
if (IS_NULL_PTR(new_node)) {
260260
return EtsAllocationFailure;
261261
}
262262

263263
EtsHashtableStatus res = ets_hashtable_insert(ets_table->hashtable, new_node, EtsHashtableAllowOverwrite, ctx->global);
264264
if (UNLIKELY(res != EtsHashtableOk)) {
265+
ets_hashtable_free_node(new_node, ctx->global);
265266
return EtsAllocationFailure;
266267
}
267268

src/libAtomVM/ets_hashtable.c

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

90-
struct HNode *ets_hashtable_new_node(term entry, int key_index)
90+
struct HNode *ets_hashtable_new_node(term tuple, int key_index)
9191
{
9292
struct HNode *new_node = malloc(sizeof(struct HNode));
9393
if (IS_NULL_PTR(new_node)) {
9494
goto cleanup;
9595
}
9696

97-
size_t size = memory_estimate_usage(entry);
97+
size_t size = memory_estimate_usage(tuple);
9898
if (UNLIKELY(memory_init_heap(&new_node->heap, size) != MEMORY_GC_OK)) {
9999
goto cleanup;
100100
}
101101

102-
term new_entry = memory_copy_term_tree(&new_node->heap, entry);
102+
term new_entry = memory_copy_term_tree(&new_node->heap, tuple);
103103
assert(term_is_tuple(new_entry));
104104
assert(term_get_tuple_arity(new_entry) >= key_index);
105105
term key = term_get_tuple_element(new_entry, key_index);

0 commit comments

Comments
 (0)