diff --git a/CMakeLists.txt b/CMakeLists.txt index 3116232..e99eb0f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,7 @@ if(NOT CMAKE_BUILD_TYPE) endif() add_compile_options( - "-Wall" "-Wextra" "-Werror" "-Wpedantic" "-fexceptions" + "-Wall" "-Werror" "-fexceptions" "$<$:-O0;-g3;-ggdb;-DARC_DEBUG;>" "$<$:-02;-g;>" ) diff --git a/cmake/archeus_sdl2.cmake b/cmake/archeus_sdl2.cmake index 9b73011..6e840f2 100644 --- a/cmake/archeus_sdl2.cmake +++ b/cmake/archeus_sdl2.cmake @@ -7,6 +7,9 @@ set(ARCHEUS_STD_SDL2_INPUT_SOURCES packages/input/sdl/input.c packages/input/sdl/keyboard.c packages/input/sdl/mouse.c + + #TODO: remove this + packages/audio/sdl/config.c ) set(ARCHEUS_STD_SDL2_GRAPHICS_SOURCES @@ -45,7 +48,15 @@ function(sdl2_check_and_init_needed _ARCHEUS_STD_SOURCES _ARCHEUS_STD_INCLUDE_DI endif() if(${ARCHEUS_STD_INPUT_BACKEND} STREQUAL "SDL2") + #TODO: remove this + find_package(SDL2_mixer REQUIRED) + list(APPEND ${_ARCHEUS_STD_SOURCES} ${ARCHEUS_STD_SDL2_INPUT_SOURCES}) + + #TODO: remove this + list(APPEND ${_ARCHEUS_STD_LINK_LIBRARIES} + PUBLIC SDL2_mixer::SDL2_mixer + ) endif() if(${ARCHEUS_STD_GRAPHICS_BACKEND} STREQUAL "SDL2") @@ -69,4 +80,4 @@ function(sdl2_check_and_init_needed _ARCHEUS_STD_SOURCES _ARCHEUS_STD_INCLUDE_DI set(${_ARCHEUS_STD_SOURCES} ${${_ARCHEUS_STD_SOURCES}} PARENT_SCOPE) set(${_ARCHEUS_STD_INCLUDE_DIRECTORIES} ${${_ARCHEUS_STD_INCLUDE_DIRECTORIES}} PARENT_SCOPE) set(${_ARCHEUS_STD_LINK_LIBRARIES} ${${_ARCHEUS_STD_LINK_LIBRARIES}} PARENT_SCOPE) -endfunction() \ No newline at end of file +endfunction() diff --git a/include/arc/std/handler.h b/include/arc/std/handler.h index 525af99..b057e62 100644 --- a/include/arc/std/handler.h +++ b/include/arc/std/handler.h @@ -5,6 +5,7 @@ extern "C" { #endif +#include "arc/std/bool.h" #include /** @@ -22,7 +23,7 @@ typedef struct ARC_Handler ARC_Handler; * * @return 0 when a == b */ -typedef uint32_t (* ARC_Handler_CompareDataFn)(void *a, void *b); +typedef ARC_Bool (* ARC_Handler_CompareDataFn)(void *a, void *b); /** * @brief a function that will take iterated data @@ -41,11 +42,12 @@ typedef void (* ARC_Handler_CleanDataFn)(void *data); /** * @brief creates ARC_Handler type * - * @param config ARC_Handler to initialize - * @param cleanfn function to clean data in handler - * can be null + * @param config ARC_Handler to initialize + * @param compareFn function to remove handler data + * @param cleanFn function to clean data in handler + * can be null */ -void ARC_Handler_Create(ARC_Handler **handler, ARC_Handler_CleanDataFn cleanfn); +void ARC_Handler_Create(ARC_Handler **handler, ARC_Handler_CompareDataFn *compareFn, ARC_Handler_CleanDataFn cleanFn); /** * @brief destroyes ARC_Handler type @@ -72,7 +74,7 @@ void ARC_Handler_Add(ARC_Handler *handler, void *data); * @param handler ARC_Handler to remove from * @param data data that is being removed */ -void ARC_Handler_Remove(ARC_Handler *handler, void *data, ARC_Handler_CompareDataFn compare); +void ARC_Handler_Remove(ARC_Handler *handler, void *data); /** * @brief remove from handler @@ -115,7 +117,7 @@ void ARC_Handler_Clean(ARC_Handler *handler); * * @param handler ARC_handler to get size from */ -uint32_t ARC_Handler_Size(ARC_Handler *handler); +uint32_t ARC_Handler_GetSize(ARC_Handler *handler); #ifdef __cplusplus } diff --git a/packages/audio/sdl/config.c b/packages/audio/sdl/config.c index 854e557..f7c1e9d 100644 --- a/packages/audio/sdl/config.c +++ b/packages/audio/sdl/config.c @@ -20,7 +20,7 @@ uint8_t ARC_Audio_Read(ARC_Config *config, ARC_String *string, void **value){ } if(string->data[0] != '"' || string->data[string->length - 1] != '"'){ - ARC_DEBUG_LOG(arc_errno, "in ARC_Point_Read(config, string, value); no matching quotes: %s", string->data); + ARC_DEBUG_LOG_ERROR_WITH_VARIABLES("in ARC_Point_Read(config, string, value); no matching quotes: %s", string->data); arc_errno = ARC_ERRNO_DATA; return 0; } diff --git a/packages/graphics/sdl/config.c b/packages/graphics/sdl/config.c index f83c124..f6e1f38 100644 --- a/packages/graphics/sdl/config.c +++ b/packages/graphics/sdl/config.c @@ -127,7 +127,7 @@ uint8_t ARC_Spritesheet_Read(ARC_Config* config, ARC_String *string, void **valu ARC_String_StripEndsWhitespace(&textureStr, temp); ARC_String_Destroy(temp); - ARC_String_CopySubstring(&temp, string, split + 1, string->length - (split + 1)); + ARC_String_CopySubstring(&temp, string, split + 1, string->length - (split + 2)); ARC_String_StripEndsWhitespace(&sizeStr, temp); ARC_String_Destroy(temp); diff --git a/packages/graphics/sdl/renderer.c b/packages/graphics/sdl/renderer.c index f4263a3..988c539 100644 --- a/packages/graphics/sdl/renderer.c +++ b/packages/graphics/sdl/renderer.c @@ -10,7 +10,7 @@ void ARC_Renderer_CreateWithEngineData(ARC_Renderer **renderer, ARC_EngineData *data){ if(!data){ arc_errno = ARC_ERRNO_NULL; - ARC_DEBUG_ERR("ARC_Renderer_CreateWithEngineData(**renderer, NULL)"); + ARC_DEBUG_LOG_ERROR("ARC_Renderer_CreateWithEngineData(**renderer, NULL)"); return; } @@ -18,7 +18,7 @@ void ARC_Renderer_CreateWithEngineData(ARC_Renderer **renderer, ARC_EngineData * if(!*renderer){ arc_errno = ARC_ERRNO_NULL; - ARC_DEBUG_LOG(arc_errno, "SDL_CreateRenderer(%p, %d, %u);", data->window, -1, SDL_RENDERER_ACCELERATED); + ARC_DEBUG_LOG_ERROR_WITH_VARIABLES("SDL_CreateRenderer(%p, %d, %u);", data->window, -1, SDL_RENDERER_ACCELERATED); free(renderer); } diff --git a/packages/graphics/sdl/sprite.c b/packages/graphics/sdl/sprite.c index 91b2832..50f2489 100644 --- a/packages/graphics/sdl/sprite.c +++ b/packages/graphics/sdl/sprite.c @@ -63,7 +63,7 @@ void ARC_Sprite_RenderRotated(ARC_Sprite *sprite, ARC_Renderer *renderer, ARC_Re void ARC_Sprite_SetFrameIndex(ARC_Sprite *sprite, uint32_t index){ if(sprite->frames->size <= index){ arc_errno = ARC_ERRNO_DATA; - ARC_DEBUG_LOG(arc_errno, "in ARC_Sprite_SetFrameIndex(sprite, %d); index out of bounds", index); + ARC_DEBUG_LOG_ERROR_WITH_VARIABLES("in ARC_Sprite_SetFrameIndex(sprite, %d); index out of bounds", index); return; } *sprite->frameIndex = index; diff --git a/packages/graphics/sdl/window.c b/packages/graphics/sdl/window.c index 43f9adc..f7b9ba4 100644 --- a/packages/graphics/sdl/window.c +++ b/packages/graphics/sdl/window.c @@ -7,7 +7,7 @@ void ARC_Window_Create(ARC_Window **window, ARC_WindowInfo *info){ if(!info){ arc_errno = ARC_ERRNO_NULL; - ARC_DEBUG_ERR("ARC_Window_Create(**window, NULL)"); + ARC_DEBUG_LOG_ERROR("ARC_Window_Create(**window, NULL)"); return; } @@ -21,7 +21,7 @@ void ARC_Window_Create(ARC_Window **window, ARC_WindowInfo *info){ if(!*window){ arc_errno = ARC_ERRNO_NULL; - ARC_DEBUG_LOG(arc_errno, "SDL_CreateWindow(%s, %d, %d, %d, %d, %x);", info->title, SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, info->w, info->h, 0); + ARC_DEBUG_LOG_ERROR_WITH_VARIABLES("SDL_CreateWindow(%s, %d, %d, %d, %d, %x);", info->title, SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, info->w, info->h, 0); free(window); } } diff --git a/src/engine/engine.c b/src/engine/engine.c index 522c9ba..dbeea04 100644 --- a/src/engine/engine.c +++ b/src/engine/engine.c @@ -19,7 +19,8 @@ void ARC_EngineData_Create(ARC_EngineData **data, ARC_Handler_CleanDataFn cleanF (*data)->keyboard = NULL; (*data)->mouse = NULL; - ARC_Handler_Create(&((*data)->state), cleanFn); + //TODO: set the destroy callback + ARC_Handler_Create(&((*data)->state), NULL, cleanFn); (*data)->dt = 0.0; (*data)->running = ARC_False; diff --git a/src/files/config.c b/src/files/config.c index ec8df39..e97594f 100644 --- a/src/files/config.c +++ b/src/files/config.c @@ -23,7 +23,7 @@ uint8_t ARC_CSV_Read(ARC_Config *config, ARC_String *string, void **value){ ARC_String *fileData; ARC_IO_FileToStr(string, &fileData); if(arc_errno){ - ARC_DEBUG_LOG(arc_errno, "ARC_CSV_Read(config, string, value) could not read in csv file: \"%s\"", string->data); + ARC_DEBUG_LOG_ERROR_WITH_VARIABLES("ARC_CSV_Read(config, string, value) could not read in csv file: \"%s\"", string->data); ARC_String_Destroy(fileData); return 0; } @@ -57,7 +57,7 @@ uint8_t ARC_CSV_Read(ARC_Config *config, ARC_String *string, void **value){ if(!width){ arc_errno = ARC_ERRNO_DATA; - ARC_DEBUG_LOG(arc_errno, "ARC_CSV_Read(config, string, value) no width of line %d", y); + ARC_DEBUG_LOG_ERROR_WITH_VARIABLES("ARC_CSV_Read(config, string, value) no width of line %d", y); ARC_String_Destroy(fileData); return 0; } diff --git a/src/math/config.c b/src/math/config.c index 2e48868..bb6ea9f 100644 --- a/src/math/config.c +++ b/src/math/config.c @@ -34,7 +34,7 @@ uint8_t ARC_Point_Read(ARC_Config *config, ARC_String *string, void **value){ } if(string->data[0] != '{' || string->data[string->length - 1] != '}'){ - ARC_DEBUG_LOG(arc_errno, "in ARC_Point_Read(config, string, value); no matching curly braces: %s", string->data); + ARC_DEBUG_LOG_ERROR_WITH_VARIABLES("in ARC_Point_Read(config, string, value); no matching curly braces: %s", string->data); arc_errno = ARC_ERRNO_DATA; return 0; } @@ -67,7 +67,7 @@ uint8_t ARC_Rect_Read(ARC_Config *config, ARC_String *string, void **value){ if(string->data[0] != '{' || string->data[string->length - 1] != '}'){ arc_errno = ARC_ERRNO_DATA; - ARC_DEBUG_LOG(arc_errno, "in ARC_Rect_Read(config, string, value); no matching curly braces: %s", string->data); + ARC_DEBUG_LOG_ERROR_WITH_VARIABLES("in ARC_Rect_Read(config, string, value); no matching curly braces: %s", string->data); return 0; } @@ -168,7 +168,7 @@ void ARC_RectArray_ReadRect(ARC_Config* config, ARC_String *stripped, uint64_t i //reading in value ARC_Rect_Read(config, substr, (void **) &tempRect); if(arc_errno){ - ARC_DEBUG_LOG(arc_errno, "in ARC_RectArray_ReadRect(config, string, index, length, arrayIndex, value); failed to read rect: %s", substr->data); + ARC_DEBUG_LOG_ERROR_WITH_VARIABLES("in ARC_RectArray_ReadRect(config, string, index, length, arrayIndex, value); failed to read rect: %s", substr->data); ARC_String_Destroy(substr); return; } @@ -188,7 +188,7 @@ uint8_t ARC_RectArray_Read(ARC_Config* config, ARC_String *string, void **value) if(string->data[0] != '{' || string->data[string->length - 1] != '}'){ arc_errno = ARC_ERRNO_DATA; - ARC_DEBUG_LOG(arc_errno, "in ARC_RectArray_Read(config, string, value); no matching curly braces: %s", string->data); + ARC_DEBUG_LOG_ERROR_WITH_VARIABLES("in ARC_RectArray_Read(config, string, value); no matching curly braces: %s", string->data); return 0; } diff --git a/src/std/config.c b/src/std/config.c index 726c15f..5f0ed90 100644 --- a/src/std/config.c +++ b/src/std/config.c @@ -103,9 +103,11 @@ void ARC_Config_SetGroup(ARC_Config *config, ARC_String *groupname){ } ARC_Hashtable_Get(config->groups, (void *)groupname->data, groupname->length, (void **)&(config->currgroup)); - if(arc_errno && arc_errno != ARC_ERRNO_NULL){ - return; - } + arc_errno = 0; + +// if(arc_errno && arc_errno != ARC_ERRNO_NULL){ +// return; +// } if(config->currgroup){ return; @@ -125,7 +127,7 @@ void ARC_Config_Get(ARC_Config *config, ARC_String *keyname, void **value){ uint64_t length = ARC_String_FindCString(keyname, "::", 2); if(arc_errno){ //TODO: Debug info here - ARC_DEBUG_ERR("in ARC_Config_Get(config, keyname, value); length threw error"); + ARC_DEBUG_LOG_ERROR("in ARC_Config_Get(config, keyname, value); length threw error"); *value = NULL; return; } @@ -141,7 +143,7 @@ void ARC_Config_Get(ARC_Config *config, ARC_String *keyname, void **value){ ARC_Hashtable *currgroup = config->currgroup; ARC_Config_SetGroup(config, group); if(arc_errno){ - ARC_DEBUG_ERR("in ARC_Config_Get(config, keyname, value); setting group threw error"); + ARC_DEBUG_LOG_ERROR("in ARC_Config_Get(config, keyname, value); setting group threw error"); ARC_String_Destroy(group); *value = NULL; return; @@ -211,7 +213,7 @@ void ARC_Config_LoadFromKey(ARC_Config *config, ARC_String *keyType, ARC_String ARC_Hashtable_Get(config->keys, keyType->data, keyType->length, (void **)&key); if(key == NULL){ arc_errno = ARC_ERRNO_DATA; - ARC_DEBUG_LOG(arc_errno, "in ARC_Config_LoadFromKey(config, string, value); no matching key: %s", keyType->data); + ARC_DEBUG_LOG_ERROR_WITH_VARIABLES("in ARC_Config_LoadFromKey(config, string, value); no matching key: %s", keyType->data); } if(arc_errno){ @@ -406,7 +408,7 @@ void ARC_Config_StripComment(ARC_String *original, ARC_String **stripped, ARC_St uint64_t endIndex = ARC_String_Find(commentString, lineEnd); ARC_String_Destroy(commentString); if(endIndex == ~(uint64_t)0){ - ARC_DEBUG_ERR("ARC_Config_RemoveComments(original, commentRemoved); No newline found when stripping single line comment"); + ARC_DEBUG_LOG_ERROR("ARC_Config_RemoveComments(original, commentRemoved); No newline found when stripping single line comment"); arc_errno = ARC_ERRNO_DATA; ARC_String_Destroy(current); *stripped = NULL; @@ -524,22 +526,17 @@ void ARC_Config_RemoveAndRunCommands(ARC_Config *config, ARC_String *original, A } void ARC_Config_FileIO(ARC_Config *config, ARC_String *path, uint8_t command){ + arc_errno = 0; //TODO: Remove this, just testing ARC_String *data; ARC_IO_FileToStr(path, &data); if(arc_errno){ - ARC_DEBUG_LOG(arc_errno, "ARC_IO_FileToStr(%s, &data, &size);\n", path->data); + ARC_DEBUG_LOG_ERROR_WITH_VARIABLES("ARC_IO_FileToStr(%s, &data, &size);\n", path->data); return; } - char *tempData = (char *)malloc(sizeof(char) * (data->length + 1)); - strncpy(tempData, data->data, data->length); - tempData[data->length] = '\n'; + ARC_String_AppendCStringWithStrlen(&data, "\n"); ARC_String *temp = data; - ARC_String_Create(&temp, tempData, data->length + 1); - free(tempData); - ARC_String_Destroy(data); - ARC_Config_RemoveComments(temp, &data); ARC_String_Destroy(temp); diff --git a/src/std/defaults/config.c b/src/std/defaults/config.c index f6304b6..780822e 100644 --- a/src/std/defaults/config.c +++ b/src/std/defaults/config.c @@ -185,7 +185,7 @@ uint8_t ARC_ConfigKey_Read_String(ARC_Config* config, ARC_String *string, void * if(string->data[0] != '"' || string->data[string->length - 1] != '"'){ arc_errno = ARC_ERRNO_DATA; - ARC_DEBUG_LOG(arc_errno, "in ARC_ConfigKey_Read_String(config, string, value); no matching quotes: %s", string->data); + ARC_DEBUG_LOG_ERROR_WITH_VARIABLES("in ARC_ConfigKey_Read_String(config, string, value); no matching quotes: %s", string->data); return 0; } @@ -214,7 +214,7 @@ void ARC_ConfigKey_StringArray_ReadString(ARC_Config* config, ARC_String *stripp //reading in value ARC_ConfigKey_Read_String(config, substr, (void **) &tempString); if(arc_errno){ - ARC_DEBUG_LOG(arc_errno, "in ARC_RectArray_ReadRect(config, string, index, length, arrayIndex, value); failed to read string: %s", substr->data); + ARC_DEBUG_LOG_ERROR_WITH_VARIABLES("in ARC_RectArray_ReadRect(config, string, index, length, arrayIndex, value); failed to read string: %s", substr->data); ARC_String_Destroy(substr); return; } @@ -233,7 +233,7 @@ uint8_t ARC_ConfigKey_Read_StringArray(ARC_Config* config, ARC_String *string, v if(string->data[0] != '{' || string->data[string->length - 1] != '}'){ arc_errno = ARC_ERRNO_DATA; - ARC_DEBUG_LOG(arc_errno, "in ARC_ConfigKey_Read_StringArray(config, string, value); no matching curly braces: %s", string->data); + ARC_DEBUG_LOG_ERROR_WITH_VARIABLES("in ARC_ConfigKey_Read_StringArray(config, string, value); no matching curly braces: %s", string->data); return 0; } diff --git a/src/std/handler.c b/src/std/handler.c index 209c155..8f82b2b 100644 --- a/src/std/handler.c +++ b/src/std/handler.c @@ -11,10 +11,10 @@ struct ARC_Handler { ARC_Handler_CleanDataFn cleanfn; }; -void ARC_Handler_Create(ARC_Handler **handler, ARC_Handler_CleanDataFn cleanfn){ +void ARC_Handler_Create(ARC_Handler **handler, ARC_Handler_CompareDataFn *compareFn, ARC_Handler_CleanDataFn cleanfn){ *handler = (ARC_Handler *) malloc(sizeof(ARC_Handler)); - ARC_Vector_Create(&((*handler)->data)); - ARC_Vector_Create(&((*handler)->trash)); + ARC_Vector_Create(&((*handler)->data), NULL); + ARC_Vector_Create(&((*handler)->trash), compareFn); (*handler)->cleanfn = cleanfn; } @@ -32,13 +32,13 @@ void ARC_Handler_Add(ARC_Handler *handler, void *data){ ARC_Vector_Add(handler->data, data); } -void ARC_Handler_Remove(ARC_Handler *handler, void *data, ARC_Handler_CompareDataFn compare){ +void ARC_Handler_Remove(ARC_Handler *handler, void *data){ ARC_Vector_Add(handler->trash, data); - ARC_Vector_Remove(handler->data, data, (ARC_Vector_CompareDataFn) compare); + ARC_Vector_Remove(handler->data, data); } void ARC_Handler_RemoveIndex(ARC_Handler *handler, uint32_t index){ - if(ARC_Vector_Size(handler->data) == 0){ + if(ARC_Vector_GetSize(handler->data) == 0){ return; } @@ -48,21 +48,21 @@ void ARC_Handler_RemoveIndex(ARC_Handler *handler, uint32_t index){ } void ARC_Handler_Iterate(ARC_Handler *handler, ARC_Handler_DataFn datafn){ - for(uint32_t i = 0; i < ARC_Vector_Size(handler->data); i++){ + for(uint32_t i = 0; i < ARC_Vector_GetSize(handler->data); i++){ datafn(ARC_Vector_Get(handler->data, i)); } } void ARC_Handler_Clear(ARC_Handler *handler){ uint32_t zeroIndex = 0; - while(ARC_Vector_Size(handler->data)){ + while(ARC_Vector_GetSize(handler->data)){ ARC_Handler_RemoveIndex(handler, zeroIndex); } } void ARC_Handler_Clean(ARC_Handler *handler){ uint32_t i = 0; - while(ARC_Vector_Size(handler->trash)){ + while(ARC_Vector_GetSize(handler->trash)){ void *data = ARC_Vector_Get(handler->trash, i); if(handler->cleanfn){ @@ -73,6 +73,6 @@ void ARC_Handler_Clean(ARC_Handler *handler){ } } -uint32_t ARC_Handler_Size(ARC_Handler *handler){ - return ARC_Vector_Size(handler->data); +uint32_t ARC_Handler_GetSize(ARC_Handler *handler){ + return ARC_Vector_GetSize(handler->data); } diff --git a/src/std/io.c b/src/std/io.c index 7779852..b9b945a 100644 --- a/src/std/io.c +++ b/src/std/io.c @@ -9,7 +9,7 @@ void ARC_IO_ReadFileToUint8t(ARC_String *path, uint8_t **data, uint64_t *length) FILE *file = fopen(path->data, "rb"); if(!file){ arc_errno = ARC_ERRNO_NULL; - ARC_DEBUG_LOG(arc_errno, "ARC_IO_FileToStr(ARC_String *path, ARC_String **data), could not open file \"%s\"", path->data); + ARC_DEBUG_LOG_ERROR_WITH_VARIABLES("ARC_IO_FileToStr(ARC_String *path, ARC_String **data), could not open file \"%s\"", path->data); *length = 0; *data = NULL; return; @@ -23,7 +23,7 @@ void ARC_IO_ReadFileToUint8t(ARC_String *path, uint8_t **data, uint64_t *length) if(*data == NULL){ fclose(file); arc_errno = ARC_ERRNO_NULL; - ARC_DEBUG_ERR("ARC_IO_FileToStr(ARC_String *path, ARC_String **data), file data is NULL"); + ARC_DEBUG_LOG_ERROR("ARC_IO_FileToStr(ARC_String *path, ARC_String **data), file data is NULL"); *length = 0; return; } @@ -31,7 +31,7 @@ void ARC_IO_ReadFileToUint8t(ARC_String *path, uint8_t **data, uint64_t *length) if(1 != fread(*data, *length, 1, file)){ fclose(file); arc_errno = ARC_ERRNO_COPY; - ARC_DEBUG_ERR("ARC_IO_FileToStr(ARC_String *path, ARC_String **data), could not copy file data"); + ARC_DEBUG_LOG_ERROR("ARC_IO_FileToStr(ARC_String *path, ARC_String **data), could not copy file data"); *length = 0; *data = NULL; return; @@ -44,7 +44,7 @@ void ARC_IO_FileToStr(ARC_String *path, ARC_String **data){ FILE *file = fopen(path->data, "rb"); if(!file){ arc_errno = ARC_ERRNO_NULL; - ARC_DEBUG_LOG(arc_errno, "ARC_IO_FileToStr(ARC_String *path, ARC_String **data), could not open file \"%s\"", path->data); + ARC_DEBUG_LOG_ERROR_WITH_VARIABLES("ARC_IO_FileToStr(ARC_String *path, ARC_String **data), could not open file \"%s\"", path->data); return; } @@ -56,7 +56,7 @@ void ARC_IO_FileToStr(ARC_String *path, ARC_String **data){ if(fileData == NULL){ fclose(file); arc_errno = ARC_ERRNO_NULL; - ARC_DEBUG_ERR("ARC_IO_FileToStr(ARC_String *path, ARC_String **data), file data is NULL"); + ARC_DEBUG_LOG_ERROR("ARC_IO_FileToStr(ARC_String *path, ARC_String **data), file data is NULL"); *data = NULL; return; } @@ -64,7 +64,7 @@ void ARC_IO_FileToStr(ARC_String *path, ARC_String **data){ if(1 != fread(fileData, length, 1, file)){ fclose(file); arc_errno = ARC_ERRNO_COPY; - ARC_DEBUG_ERR("ARC_IO_FileToStr(ARC_String *path, ARC_String **data), could not copy file data"); + ARC_DEBUG_LOG_ERROR("ARC_IO_FileToStr(ARC_String *path, ARC_String **data), could not copy file data"); *data = NULL; return; } @@ -78,14 +78,14 @@ void ARC_IO_WriteStrToFile(ARC_String *path, ARC_String *data){ FILE *file = fopen(path->data, "wb"); if(!file){ arc_errno = ARC_ERRNO_NULL; - ARC_DEBUG_LOG(arc_errno, "ARC_IO_WriteStrToFile(ARC_String *path, ARC_String *data), could not open file \"%s\"", path->data); + ARC_DEBUG_LOG_ERROR_WITH_VARIABLES("ARC_IO_WriteStrToFile(ARC_String *path, ARC_String *data), could not open file \"%s\"", path->data); return; } if(1 != fwrite(data->data, data->length, 1, file)){ fclose(file); arc_errno = ARC_ERRNO_COPY; - ARC_DEBUG_ERR("ARC_IO_WriteStrToFile(ARC_String *path, ARC_String **data), could not write file data"); + ARC_DEBUG_LOG_ERROR("ARC_IO_WriteStrToFile(ARC_String *path, ARC_String **data), could not write file data"); return; } diff --git a/src/std/queue.c b/src/std/queue.c index 53e4142..4f3466c 100644 --- a/src/std/queue.c +++ b/src/std/queue.c @@ -24,7 +24,7 @@ void ARC_Queue_Create(ARC_Queue **queue){ void ARC_Queue_Destroy(ARC_Queue *queue){ if(queue->currentSize != 0 || queue->node != NULL){ arc_errno = ARC_ERRNO_DATA; - ARC_DEBUG_ERR("ARC_Queue_Destroy(queue) called, but queue was not empty"); + ARC_DEBUG_LOG_ERROR("ARC_Queue_Destroy(queue) called, but queue was not empty"); return; } @@ -34,7 +34,7 @@ void ARC_Queue_Destroy(ARC_Queue *queue){ void ARC_Queue_Push(ARC_Queue *queue, void *data){ if(queue->currentSize == ~(uint32_t)0){ arc_errno = ARC_ERRNO_OVERFLOW; - ARC_DEBUG_ERR("ARC_Queue_Push(queue) called, size of queue is maxed, cannot add another node"); + ARC_DEBUG_LOG_ERROR("ARC_Queue_Push(queue) called, size of queue is maxed, cannot add another node"); return; } @@ -53,7 +53,7 @@ void ARC_Queue_Push(ARC_Queue *queue, void *data){ for(uint32_t i = 1; i < queue->currentSize; i++){ if(end->next == NULL){ arc_errno = ARC_ERRNO_NULL; - ARC_DEBUG_ERR("ARC_Queue_Push(queue), when getting end node encountered a NULL node"); + ARC_DEBUG_LOG_ERROR("ARC_Queue_Push(queue), when getting end node encountered a NULL node"); return; } @@ -72,14 +72,14 @@ void ARC_Queue_Push(ARC_Queue *queue, void *data){ void *ARC_Queue_Pop(ARC_Queue *queue){ if(queue->currentSize == 0){ arc_errno = ARC_ERRNO_DATA; - ARC_DEBUG_ERR("ARC_Queue_Pop(queue) called, but queue was empty"); + ARC_DEBUG_LOG_ERROR("ARC_Queue_Pop(queue) called, but queue was empty"); return NULL; } ARC_QueueNode *node = queue->node; if(node == NULL){ arc_errno = ARC_ERRNO_NULL; - ARC_DEBUG_ERR("ARC_Queue_Pop(queue) called, but node was NULL"); + ARC_DEBUG_LOG_ERROR("ARC_Queue_Pop(queue) called, but node was NULL"); return NULL; } diff --git a/src/std/stack.c b/src/std/stack.c index ca4f8a2..3a5b893 100644 --- a/src/std/stack.c +++ b/src/std/stack.c @@ -24,7 +24,7 @@ void ARC_Stack_Create(ARC_Stack **stack){ void ARC_Stack_Destroy(ARC_Stack *stack){ if(stack->currentSize != 0 || stack->node != NULL){ arc_errno = ARC_ERRNO_DATA; - ARC_DEBUG_ERR("ARC_Stack_Destroy(stack) called, but stack was not empty"); + ARC_DEBUG_LOG_ERROR("ARC_Stack_Destroy(stack) called, but stack was not empty"); return; } @@ -34,7 +34,7 @@ void ARC_Stack_Destroy(ARC_Stack *stack){ void ARC_Stack_Push(ARC_Stack *stack, void *data){ if(stack->currentSize == ~(uint32_t)0){ arc_errno = ARC_ERRNO_OVERFLOW; - ARC_DEBUG_ERR("ARC_Stack_Push(stack) called, size of stack is maxed, cannot add another node"); + ARC_DEBUG_LOG_ERROR("ARC_Stack_Push(stack) called, size of stack is maxed, cannot add another node"); return; } @@ -51,14 +51,14 @@ void ARC_Stack_Push(ARC_Stack *stack, void *data){ void *ARC_Stack_Pop(ARC_Stack *stack){ if(stack->currentSize == 0){ arc_errno = ARC_ERRNO_DATA; - ARC_DEBUG_ERR("ARC_Stack_Pop(stack) called, but stack was not empty"); + ARC_DEBUG_LOG_ERROR("ARC_Stack_Pop(stack) called, but stack was not empty"); return NULL; } ARC_StackNode *node = stack->node; if(node == NULL){ arc_errno = ARC_ERRNO_NULL; - ARC_DEBUG_ERR("ARC_Stack_Pop(stack) called, but node was NULL"); + ARC_DEBUG_LOG_ERROR("ARC_Stack_Pop(stack) called, but node was NULL"); return NULL; } diff --git a/src/std/string.c b/src/std/string.c index 3c6119f..cf6425c 100644 --- a/src/std/string.c +++ b/src/std/string.c @@ -204,7 +204,7 @@ double ARC_String_ToDouble(ARC_String *string){ uint64_t ARC_String_Find(ARC_String *string, ARC_String *substring){ if(!string || !substring){ - ARC_DEBUG_ERR("ARC_String_Find(string, substring), string or substring was null"); + ARC_DEBUG_LOG_ERROR("ARC_String_Find(string, substring), string or substring was null"); arc_errno = ARC_ERRNO_NULL; return ~(uint64_t)0; } @@ -226,7 +226,7 @@ uint64_t ARC_String_Find(ARC_String *string, ARC_String *substring){ uint64_t ARC_String_FindCString(ARC_String *string, const char *cstring, uint64_t length){ if(!string || !cstring){ arc_errno = ARC_ERRNO_NULL; - ARC_DEBUG_ERR("ARC_String_FindCString(string, cstring, length), string or cstring was null"); + ARC_DEBUG_LOG_ERROR("ARC_String_FindCString(string, cstring, length), string or cstring was null"); return ~(uint64_t)0; } @@ -251,7 +251,7 @@ uint64_t ARC_String_FindCStringWithStrlen(ARC_String *string, const char *cstrin uint64_t ARC_String_FindBack(ARC_String *string, ARC_String *substring){ if(!string || !substring){ arc_errno = ARC_ERRNO_NULL; - ARC_DEBUG_ERR("ARC_String_FindBack(string, substring), string or substring was null"); + ARC_DEBUG_LOG_ERROR("ARC_String_FindBack(string, substring), string or substring was null"); return ~(uint64_t)0; } @@ -272,7 +272,7 @@ uint64_t ARC_String_FindBack(ARC_String *string, ARC_String *substring){ uint64_t ARC_String_FindBackCString(ARC_String *string, const char *cstring, uint64_t length){ if(!string || !cstring){ arc_errno = ARC_ERRNO_NULL; - ARC_DEBUG_ERR("ARC_String_FindBack(string, substring), string or substring was null"); + ARC_DEBUG_LOG_ERROR("ARC_String_FindBack(string, substring), string or substring was null"); return ~(uint64_t)0; } @@ -512,7 +512,7 @@ void ARC_String_CopyReplaceMatching(ARC_String **newString, ARC_String *original //TODO: probs want to check if the replacement goes over a uint64_t size if(original == NULL || pattern == NULL || replacement == NULL){ arc_errno = ARC_ERRNO_NULL; - ARC_DEBUG_ERR("ARC_String_CopyReplaceMatching(newString, original, pattern, replacement), original, pattern, or replacement was null"); + ARC_DEBUG_LOG_ERROR("ARC_String_CopyReplaceMatching(newString, original, pattern, replacement), original, pattern, or replacement was null"); return; } @@ -551,20 +551,11 @@ void ARC_String_CopyReplaceMatching(ARC_String **newString, ARC_String *original (*newString)->data[(*newString)->length] = '\0'; } -/** - * @brief replaces characters in string matching the given pattern - * - * @param string the string that will be modified, will discard changes and set arc_errno on fail - * @param patternCString the cstring pattern to replace in the string on match - * @param patternLength the lenght of the cstring pattern - * @param replacementCstring the cstring that will replace the matched pattern - * @param replacementLength the length of the cstring replacement -*/ void ARC_String_ReplaceMatchingCString(ARC_String **string, char *patternCString, uint64_t patternLength, char *replacementCString, uint64_t replacementLength){ //TODO: probs want to check if the replacement goes over a uint64_t size if(*string == NULL || patternCString == NULL || replacementCString == NULL){ arc_errno = ARC_ERRNO_NULL; - ARC_DEBUG_ERR("ARC_String_ReplaceMatchingCString(string, patternCString, patternLength, replacementCString, replacementLength), *string, patternCString, or replacementCString was null"); + ARC_DEBUG_LOG_ERROR("ARC_String_ReplaceMatchingCString(string, patternCString, patternLength, replacementCString, replacementLength), *string, patternCString, or replacementCString was null"); return; }