From 76222d31d42239d71b73156999334266592da463 Mon Sep 17 00:00:00 2001 From: Abdelrahman Said Date: Thu, 21 Mar 2024 07:26:26 +0000 Subject: [PATCH] Namespace all functions --- cpath/include/cpath.h | 6 +++--- dstr/include/dstr.h | 26 +++++++++++++------------- dstr/src/dstr.c | 32 ++++++++++++++++---------------- mem/include/arena/mem_arena.h | 10 +++++----- mem/include/util/mem_utils.h | 2 +- mem/src/arena/mem_arena.c | 18 +++++++++--------- mem/src/util/mem_utils.c | 2 +- 7 files changed, 48 insertions(+), 48 deletions(-) diff --git a/cpath/include/cpath.h b/cpath/include/cpath.h index 99bbaa6..baa7b4a 100644 --- a/cpath/include/cpath.h +++ b/cpath/include/cpath.h @@ -6,10 +6,10 @@ #define NUMPARTS(...) \ (sizeof((const char *[]){"", __VA_ARGS__}) / sizeof(const char *) - 1) -#define cpath_join_path(DST, ...) \ +#define wapp_cpath_join_path(DST, ...) \ join_path(DST, NUMPARTS(__VA_ARGS__), __VA_ARGS__) -#define cpath_dirname(DST, PATH) dirup(DST, 1, PATH) -#define cpath_dirup(DST, COUNT, PATH) dirup(DST, COUNT, PATH) +#define wapp_cpath_dirname(DST, PATH) dirup(DST, 1, PATH) +#define wapp_cpath_dirup(DST, COUNT, PATH) dirup(DST, COUNT, PATH) void join_path(char *dst, u64 count, ...); void dirup(char *dst, u64 levels, const char *path); diff --git a/dstr/include/dstr.h b/dstr/include/dstr.h index 88672a4..5b779b4 100644 --- a/dstr/include/dstr.h +++ b/dstr/include/dstr.h @@ -5,18 +5,18 @@ typedef struct dstr String; -String *dstr_with_capacity(u64 capacity); -String *dstr_from_string(const char *str); -void dstr_update(String **dst, const char *src); -void dstr_free(String **str); -void dstr_concat(String **dst, const char *src); -void dstr_append(String **dst, char c); -void dstr_resize(String **str); -void dstr_clear(String *str); -void dstr_print(const String *str); -i64 dstr_find(const String *str, const char *substr); -u64 dstr_length(const String *str); -u64 dstr_capacity(const String *str); -const char *dstr_to_cstr(const String *str); +String *wapp_dstr_with_capacity(u64 capacity); +String *wapp_dstr_from_string(const char *str); +void wapp_dstr_update(String **dst, const char *src); +void wapp_dstr_free(String **str); +void wapp_dstr_concat(String **dst, const char *src); +void wapp_dstr_append(String **dst, char c); +void wapp_dstr_resize(String **str); +void wapp_dstr_clear(String *str); +void wapp_dstr_print(const String *str); +i64 wapp_dstr_find(const String *str, const char *substr); +u64 wapp_dstr_length(const String *str); +u64 wapp_dstr_capacity(const String *str); +const char *wapp_dstr_to_cstr(const String *str); #endif // !DSTR_H diff --git a/dstr/src/dstr.c b/dstr/src/dstr.c index 3ecd824..a7430d8 100644 --- a/dstr/src/dstr.c +++ b/dstr/src/dstr.c @@ -14,7 +14,7 @@ struct dstr { char buf[]; }; -String *dstr_with_capacity(u64 capacity) { +String *wapp_dstr_with_capacity(u64 capacity) { String *out = (String *)malloc(sizeof(String) + capacity + 1); if (!out) { @@ -28,7 +28,7 @@ String *dstr_with_capacity(u64 capacity) { return out; } -String *dstr_from_string(const char *str) { +String *wapp_dstr_from_string(const char *str) { if (!str) { return NULL; } @@ -37,7 +37,7 @@ String *dstr_from_string(const char *str) { u64 capacity = length * CAPACITY_SCALAR; - String *out = dstr_with_capacity(capacity); + String *out = wapp_dstr_with_capacity(capacity); if (!out) { return NULL; @@ -49,7 +49,7 @@ String *dstr_from_string(const char *str) { return out; } -void dstr_update(String **dst, const char *src) { +void wapp_dstr_update(String **dst, const char *src) { if (!dst || !(*dst)) { return; } @@ -81,7 +81,7 @@ void dstr_update(String **dst, const char *src) { } } -void dstr_free(String **str) { +void wapp_dstr_free(String **str) { if (!str || !(*str)) { return; } @@ -90,7 +90,7 @@ void dstr_free(String **str) { *str = NULL; } -void dstr_concat(String **dst, const char *src) { +void wapp_dstr_concat(String **dst, const char *src) { if (!dst || !(*dst)) { return; } @@ -109,10 +109,10 @@ void dstr_concat(String **dst, const char *src) { strncpy(str, (*dst)->buf, (*dst)->size); strncat(str, src, src_length); - dstr_update(dst, str); + wapp_dstr_update(dst, str); } -void dstr_append(String **dst, char c) { +void wapp_dstr_append(String **dst, char c) { if (!dst || !(*dst)) { return; } @@ -125,10 +125,10 @@ void dstr_append(String **dst, char c) { strncpy(str, (*dst)->buf, (*dst)->size); str[(*dst)->size] = c; - dstr_update(dst, str); + wapp_dstr_update(dst, str); } -void dstr_resize(String **str) { +void wapp_dstr_resize(String **str) { if (!str || !(*str)) { return; } @@ -146,7 +146,7 @@ void dstr_resize(String **str) { *str = tmp; } -void dstr_clear(String *str) { +void wapp_dstr_clear(String *str) { if (!str || str->size == 0) { return; } @@ -155,7 +155,7 @@ void dstr_clear(String *str) { str->size = 0; } -void dstr_print(const String *str) { +void wapp_dstr_print(const String *str) { if (!str) { return; } @@ -163,7 +163,7 @@ void dstr_print(const String *str) { printf("%s\n", str->buf); } -i64 dstr_find(const String *str, const char *substr) { +i64 wapp_dstr_find(const String *str, const char *substr) { if (!str || !substr) { return -1; } @@ -194,7 +194,7 @@ i64 dstr_find(const String *str, const char *substr) { return -1; } -u64 dstr_length(const String *str) { +u64 wapp_dstr_length(const String *str) { if (!str) { return 0; } @@ -202,7 +202,7 @@ u64 dstr_length(const String *str) { return str->size; } -u64 dstr_capacity(const String *str) { +u64 wapp_dstr_capacity(const String *str) { if (!str) { return 0; } @@ -210,7 +210,7 @@ u64 dstr_capacity(const String *str) { return str->capacity; } -const char *dstr_to_cstr(const String *str) { +const char *wapp_dstr_to_cstr(const String *str) { if (!str) { return ""; } diff --git a/mem/include/arena/mem_arena.h b/mem/include/arena/mem_arena.h index 96c2366..c39a956 100644 --- a/mem/include/arena/mem_arena.h +++ b/mem/include/arena/mem_arena.h @@ -6,10 +6,10 @@ typedef struct growing_arena Arena; -bool mem_arena_init(Arena **arena, u64 base_capacity); -void *mem_arena_alloc(Arena *arena, u64 size); -void *mem_arena_alloc_aligned(Arena *arena, u64 size, u64 alignment); -void mem_arena_clear(Arena *arena); -void mem_arena_free(Arena **arena); +bool wapp_mem_arena_init(Arena **arena, u64 base_capacity); +void *wapp_mem_arena_alloc(Arena *arena, u64 size); +void *wapp_mem_arena_alloc_aligned(Arena *arena, u64 size, u64 alignment); +void wapp_mem_arena_clear(Arena *arena); +void wapp_mem_arena_free(Arena **arena); #endif // !MEM_ARENA_H diff --git a/mem/include/util/mem_utils.h b/mem/include/util/mem_utils.h index dcb7133..48b37d1 100644 --- a/mem/include/util/mem_utils.h +++ b/mem/include/util/mem_utils.h @@ -3,6 +3,6 @@ #include "aliases.h" -void *mem_util_align_forward(void *ptr, u64 alignment); +void *wapp_mem_util_align_forward(void *ptr, u64 alignment); #endif // !MEM_UTILS_H diff --git a/mem/src/arena/mem_arena.c b/mem/src/arena/mem_arena.c index f1dc5d4..d1b10e0 100644 --- a/mem/src/arena/mem_arena.c +++ b/mem/src/arena/mem_arena.c @@ -34,7 +34,7 @@ internal void base_arena_free(BaseArena *arena); // PUBLIC API -bool mem_arena_init(Arena **arena, u64 base_capacity) { +bool wapp_mem_arena_init(Arena **arena, u64 base_capacity) { if (!arena || *arena) { return false; } @@ -49,14 +49,14 @@ bool mem_arena_init(Arena **arena, u64 base_capacity) { arena_ptr->active_arena = (BaseArena *)malloc(sizeof(BaseArena)); if (!(arena_ptr->active_arena)) { - mem_arena_free(arena); + wapp_mem_arena_free(arena); return false; } memset(arena_ptr->active_arena, 0, sizeof(BaseArena)); if (!base_arena_init(arena_ptr->active_arena, base_capacity)) { - mem_arena_free(arena); + wapp_mem_arena_free(arena); return false; } @@ -66,11 +66,11 @@ bool mem_arena_init(Arena **arena, u64 base_capacity) { return true; } -void *mem_arena_alloc(Arena *arena, u64 size) { - return mem_arena_alloc_aligned(arena, size, DEFAULT_ALIGNMENT); +void *wapp_mem_arena_alloc(Arena *arena, u64 size) { + return wapp_mem_arena_alloc_aligned(arena, size, DEFAULT_ALIGNMENT); } -void *mem_arena_alloc_aligned(Arena *arena, u64 size, u64 alignment) { +void *wapp_mem_arena_alloc_aligned(Arena *arena, u64 size, u64 alignment) { if (!arena || !(arena->active_arena)) { return NULL; } @@ -110,7 +110,7 @@ void *mem_arena_alloc_aligned(Arena *arena, u64 size, u64 alignment) { return output; } -void mem_arena_clear(Arena *arena) { +void wapp_mem_arena_clear(Arena *arena) { if (!arena) { return; } @@ -129,7 +129,7 @@ void mem_arena_clear(Arena *arena) { arena->active_arena = new_active; } -void mem_arena_free(Arena **arena) { +void wapp_mem_arena_free(Arena **arena) { if (!arena) { return; } @@ -200,7 +200,7 @@ internal void *base_arena_alloc_aligned(BaseArena *arena, u64 size, return NULL; } - u8 *output = mem_util_align_forward((void *)(arena->offset), alignment); + u8 *output = wapp_mem_util_align_forward((void *)(arena->offset), alignment); if (output + size >= arena->buf + arena->capacity) { return NULL; } diff --git a/mem/src/util/mem_utils.c b/mem/src/util/mem_utils.c index 58d8ae3..e5d2c8e 100644 --- a/mem/src/util/mem_utils.c +++ b/mem/src/util/mem_utils.c @@ -6,7 +6,7 @@ internal bool is_power_of_two(u64 num) { return (num & (num - 1)) == 0; } -void *mem_util_align_forward(void *ptr, u64 alignment) { +void *wapp_mem_util_align_forward(void *ptr, u64 alignment) { if (!ptr) { return NULL; }