From 719d491216c5a33323c970d6c06f4a71b9b49e1e Mon Sep 17 00:00:00 2001 From: Mineplay Date: Fri, 11 Jul 2025 06:32:48 -0500 Subject: [PATCH] feat(string): implemented remove function --- Include/Fledasty/Strings/String.h | 1 + Src/Strings/String.c | 22 ++++++++++++++++++++++ Src/Strings/UTF8String.c | 3 ++- Tests/Main.c | 2 ++ 4 files changed, 27 insertions(+), 1 deletion(-) diff --git a/Include/Fledasty/Strings/String.h b/Include/Fledasty/Strings/String.h index 53fb789..2620f76 100644 --- a/Include/Fledasty/Strings/String.h +++ b/Include/Fledasty/Strings/String.h @@ -44,5 +44,6 @@ FledastyError fledasty_string_insert_before_string(FledastyString *current_strin FledastyError fledasty_string_insert_after_string(FledastyString *current_string, char *after_character_string, const size_t after_character_string_size, char *character_string, const size_t character_string_size); FledastyError fledasty_string_pop(FledastyString *current_string); +FledastyError fledasty_string_remove(FledastyString *current_string, char *character_string, const size_t character_string_size); #endif diff --git a/Src/Strings/String.c b/Src/Strings/String.c index a5f2d41..9b3dbdf 100644 --- a/Src/Strings/String.c +++ b/Src/Strings/String.c @@ -165,3 +165,25 @@ FledastyError fledasty_string_pop(FledastyString *current_string) { return FLEDASTY_ERROR_NONE; } + +FledastyError fledasty_string_remove(FledastyString *current_string, char *character_string, const size_t character_string_size) { + if (current_string == NULL || character_string == NULL || character_string_size == 0) { + return FLEDASTY_ERROR_INVALID_POINTER; + } + + size_t index = 0; + while (index < (current_string->size - character_string_size)) { + if (hallocy_compare_memory(current_string->character_string + index, character_string, character_string_size)) { + hallocy_move_memory(current_string->character_string + index, current_string->character_string + index + character_string_size, current_string->size - (index + character_string_size)); + + current_string->size -= character_string_size; + current_string->character_string[current_string->size] = '\0'; + + return FLEDASTY_ERROR_NONE; + } + + index += 1; + } + + return FLEDASTY_ERROR_VALUE_NOT_FOUND; +} diff --git a/Src/Strings/UTF8String.c b/Src/Strings/UTF8String.c index 3b1c281..ff17acb 100644 --- a/Src/Strings/UTF8String.c +++ b/Src/Strings/UTF8String.c @@ -126,7 +126,7 @@ FledastyError fledasty_utf8_string_insert_before_string(FledastyUtf8String *curr current_string->size += character_string_size; current_string->character_string[current_string->size] = '\0'; - + return FLEDASTY_ERROR_NONE; } @@ -209,6 +209,7 @@ FledastyError fledasty_utf8_string_remove(FledastyUtf8String *current_string, un current_string->size -= character_string_size; current_string->character_string[current_string->size] = '\0'; + return FLEDASTY_ERROR_NONE; } diff --git a/Tests/Main.c b/Tests/Main.c index a54e812..3a36cdf 100644 --- a/Tests/Main.c +++ b/Tests/Main.c @@ -295,6 +295,8 @@ int main() { printf("%s\n", normal_test_string.character_string); fledasty_string_pop(&normal_test_string); printf("%s\n", normal_test_string.character_string); + fledasty_string_remove(&normal_test_string, "Bye", 3); + printf("%s\n", normal_test_string.character_string); fledasty_string_free(&normal_test_string); printf("Done\n");