From 8a70c759481ec81a92ca1e934068d737e1b4878d Mon Sep 17 00:00:00 2001 From: Davide Bettio Date: Wed, 8 Nov 2023 14:59:00 +0100 Subject: [PATCH] Make `globalcontext_insert_atom(_maybe_copy)` an inline function globalcontext_insert_atom just calls globalcontext_insert_atom_maybe_copy that calls `atom_table_ensure_atom`. Signed-off-by: Davide Bettio --- src/libAtomVM/globalcontext.c | 16 ---------------- src/libAtomVM/globalcontext.h | 20 ++++++++++++++------ 2 files changed, 14 insertions(+), 22 deletions(-) diff --git a/src/libAtomVM/globalcontext.c b/src/libAtomVM/globalcontext.c index c0b91d13a..f0bd87054 100644 --- a/src/libAtomVM/globalcontext.c +++ b/src/libAtomVM/globalcontext.c @@ -384,22 +384,6 @@ int globalcontext_get_registered_process(GlobalContext *glb, int atom_index) return 0; } -int globalcontext_insert_atom(GlobalContext *glb, AtomString atom_string) -{ - long index = atom_table_ensure_atom(glb->atom_table, atom_string, AtomTableNoOpts); - if (UNLIKELY(index == ATOM_TABLE_NOT_FOUND)) { - abort(); - } - return index; -} - -int globalcontext_insert_atom_maybe_copy(GlobalContext *glb, AtomString atom_string, int copy) -{ - long index = atom_table_ensure_atom( - glb->atom_table, atom_string, copy ? AtomTableCopyAtom : AtomTableNoOpts); - return index; -} - bool globalcontext_is_atom_index_equal_to_atom_string(GlobalContext *glb, int atom_index_a, AtomString atom_string_b) { AtomString atom_string_a; diff --git a/src/libAtomVM/globalcontext.h b/src/libAtomVM/globalcontext.h index 9c71264d7..2d8aafeda 100644 --- a/src/libAtomVM/globalcontext.h +++ b/src/libAtomVM/globalcontext.h @@ -266,11 +266,6 @@ bool globalcontext_unregister_process(GlobalContext *glb, int atom_index); */ void globalcontext_maybe_unregister_process_id(GlobalContext *glb, int process_id); -/** - * @brief equivalent to globalcontext_insert_atom_maybe_copy(glb, atom_string, 0); - */ -int globalcontext_insert_atom(GlobalContext *glb, AtomString atom_string); - /** * @brief Inserts an atom into the global atoms table, making a copy of the supplied atom * string, if copy is non-zero. @@ -282,7 +277,20 @@ int globalcontext_insert_atom(GlobalContext *glb, AtomString atom_string); * assumes "ownership" of the allocated memory. * @returns newly added atom id or -1 in case of failure. */ -int globalcontext_insert_atom_maybe_copy(GlobalContext *glb, AtomString atom_string, int copy); +static inline int globalcontext_insert_atom_maybe_copy(GlobalContext *glb, AtomString atom_string, int copy) +{ + long index = atom_table_ensure_atom( + glb->atom_table, atom_string, copy ? AtomTableCopyAtom : AtomTableNoOpts); + return index; +} + +/** + * @brief equivalent to globalcontext_insert_atom_maybe_copy(glb, atom_string, 0); + */ +static inline int globalcontext_insert_atom(GlobalContext *glb, AtomString atom_string) +{ + return globalcontext_insert_atom_maybe_copy(glb, atom_string, 0); +} /** * @brief Compares an atom table index with an AtomString.