diff --git a/Include/Fledasty/Core/DynamicArray.h b/Include/Fledasty/Core/DynamicArray.h index ab1d35d..5097f84 100644 --- a/Include/Fledasty/Core/DynamicArray.h +++ b/Include/Fledasty/Core/DynamicArray.h @@ -47,6 +47,8 @@ FledastyError fledasty_dynamic_array_insert_after_value(FledastyDynamicArray *cu void *fledasty_dynamic_array_get(const FledastyDynamicArray *current_dynamic_array, const size_t index); +FledastyError fledasty_dynamic_array_remove_value(FledastyDynamicArray *current_dynamic_array, void *value); + bool fledasty_dynamic_array_has_value(const FledastyDynamicArray *current_dynamic_array, void *value); inline static bool fledasty_dynamic_array_is_empty(const FledastyDynamicArray *current_dynamic_array) { return current_dynamic_array->size == 0; } diff --git a/Src/Core/DynamicArray.c b/Src/Core/DynamicArray.c index 028e8fa..17e188c 100644 --- a/Src/Core/DynamicArray.c +++ b/Src/Core/DynamicArray.c @@ -184,6 +184,27 @@ void *fledasty_dynamic_array_get(const FledastyDynamicArray *current_dynamic_arr return current_dynamic_array->buffer + (index * current_dynamic_array->element_byte_size); } +FledastyError fledasty_dynamic_array_remove_value(FledastyDynamicArray *current_dynamic_array, void *value) { + if (current_dynamic_array == NULL || value == NULL) { + return FLEDASTY_ERROR_INVALID_POINTER; + } + + size_t byte_index = 0; + size_t byte_size = current_dynamic_array->size * current_dynamic_array->element_byte_size; + while (byte_index < byte_size && !hallocy_compare_memory(current_dynamic_array->buffer + byte_index, value, current_dynamic_array->element_byte_size)) { + byte_index += current_dynamic_array->element_byte_size; + } + + if (byte_index == byte_size) { + return FLEDASTY_ERROR_VALUE_NOT_FOUND; + } + + hallocy_copy_memory(current_dynamic_array->buffer + byte_index, current_dynamic_array->buffer + (byte_index + current_dynamic_array->element_byte_size), byte_size - (byte_index + current_dynamic_array->element_byte_size)); + current_dynamic_array->size -= 1; + + return FLEDASTY_ERROR_NONE; +} + bool fledasty_dynamic_array_has_value(const FledastyDynamicArray *current_dynamic_array, void *value) { if (current_dynamic_array == NULL) { return false; diff --git a/Tests/Main.c b/Tests/Main.c index b38895a..5029906 100644 --- a/Tests/Main.c +++ b/Tests/Main.c @@ -83,6 +83,9 @@ int main() { insert_at_value = 35; fledasty_dynamic_array_insert_after_value(&test_dynamic_array, &insert_at_value, &insert_value); + int remove_value = 15; + fledasty_dynamic_array_remove_value(&test_dynamic_array, &remove_value); + for (int i = 0; i < test_dynamic_array.size; i += 1) { int *dynamic_array_data = (int*)fledasty_dynamic_array_get(&test_dynamic_array, i); printf("Dynamic array get: %d\n", *dynamic_array_data);