From 3fd81b36ebbba62b345847bc373607c5a62c36b8 Mon Sep 17 00:00:00 2001 From: Mosder Date: Thu, 13 Aug 2026 18:37:41 +0200 Subject: added optional prefixes to the lib for a sort of namespacing to avoid conflicts --- src/mem/alloc.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'src/mem') diff --git a/src/mem/alloc.c b/src/mem/alloc.c index 7acea02..7a85d2d 100644 --- a/src/mem/alloc.c +++ b/src/mem/alloc.c @@ -1,3 +1,4 @@ +#define MOSLIB_FORCE_PREFIXES #include "moslib/mem/alloc.h" #include @@ -6,39 +7,39 @@ #define ERR_MESS(fl, ln, fn, msg) "%s:%d - error in function %s:\n%s\n", fl, ln, fn, msg -void *safe_malloc_fn(size_t size, const char *file, int line, const char *func) { - for (size_t i = 0; i < MOSLIB_MAX_ALLOC_ATTEMPTS; i++) { +void *mos_safe_malloc_fn(size_t size, const char *file, int line, const char *func) { + for (size_t i = 0; i < MOS_MAX_ALLOC_ATTEMPTS; i++) { void *p = malloc(size); if (p) return p; - if (i < MOSLIB_MAX_ALLOC_ATTEMPTS - 1) { + if (i < MOS_MAX_ALLOC_ATTEMPTS - 1) { fprintf(stderr, ERR_MESS(file, line, func, "malloc failed - retrying in 1s...")); sleep(1); } } char errmes[64]; - sprintf(errmes, "FATAL: malloc failed %d times - exiting...", MOSLIB_MAX_ALLOC_ATTEMPTS); + sprintf(errmes, "FATAL: malloc failed %d times - exiting...", MOS_MAX_ALLOC_ATTEMPTS); fprintf(stderr, ERR_MESS(file, line, func, errmes)); exit(EXIT_FAILURE); } -void *safe_realloc_fn(void *ptr, size_t size, const char *file, int line, const char *func) { +void *mos_safe_realloc_fn(void *ptr, size_t size, const char *file, int line, const char *func) { if (!ptr) - return safe_malloc_fn(size, file, line, func); + return mos_safe_malloc_fn(size, file, line, func); - for (size_t i = 0; i < MOSLIB_MAX_ALLOC_ATTEMPTS; i++) { + for (size_t i = 0; i < MOS_MAX_ALLOC_ATTEMPTS; i++) { void *p = realloc(ptr, size); if (p) return p; - if (i < MOSLIB_MAX_ALLOC_ATTEMPTS - 1) { + if (i < MOS_MAX_ALLOC_ATTEMPTS - 1) { fprintf(stderr, ERR_MESS(file, line, func, "realloc failed - retrying in 1s...")); sleep(1); } } char errmes[64]; - sprintf(errmes, "FATAL: realloc failed %d times - exiting...", MOSLIB_MAX_ALLOC_ATTEMPTS); + sprintf(errmes, "FATAL: realloc failed %d times - exiting...", MOS_MAX_ALLOC_ATTEMPTS); fprintf(stderr, ERR_MESS(file, line, func, errmes)); exit(EXIT_FAILURE); } -- cgit v1.2.3