diff --git a/src/util-mem.h b/src/util-mem.h index 57f5312c5d..aaabd0158c 100644 --- a/src/util-mem.h +++ b/src/util-mem.h @@ -161,30 +161,6 @@ SC_ATOMIC_EXTERN(unsigned int, engine_stage); (void*)ptrmem; \ }) -#define SCStrndup(a, maxlen) ({ \ - char *ptrmem = NULL; \ - extern size_t global_mem; \ - extern uint8_t print_mem_flag; \ - size_t len = strnlen((a), (maxlen)); \ - \ - ptrmem = strndup((a), (maxlen)); \ - if (ptrmem == NULL) { \ - SCLogError(SC_ERR_MEM_ALLOC, "SCStrndup failed: %s, while trying " \ - "to allocate %"PRIuMAX" bytes", strerror(errno), (uintmax_t)len); \ - if (SC_ATOMIC_GET(engine_stage) == SURICATA_INIT) {\ - SCLogError(SC_ERR_FATAL, "Out of memory. The engine cannot be initialized. Exiting..."); \ - exit(EXIT_FAILURE); \ - } \ - } \ - \ - global_mem += len; \ - if (print_mem_flag == 1) { \ - SCLogInfo("SCStrndup return at %p of size %"PRIuMAX, \ - ptrmem, (uintmax_t)len); \ - } \ - (void*)ptrmem; \ -}) - #define SCFree(a) ({ \ extern uint8_t print_mem_flag; \ if (print_mem_flag == 1) { \ @@ -257,22 +233,6 @@ SC_ATOMIC_EXTERN(unsigned int, engine_stage); (void*)ptrmem; \ }) -#define SCStrndup(a, maxlen) ({ \ - char *ptrmem = NULL; \ - \ - ptrmem = strndup((a), (maxlen)); \ - if (ptrmem == NULL) { \ - if (SC_ATOMIC_GET(engine_stage) == SURICATA_INIT) {\ - size_t len = strnlen((a), (maxlen)); \ - SCLogError(SC_ERR_MEM_ALLOC, "SCStrdup failed: %s, while trying " \ - "to allocate %"PRIuMAX" bytes", strerror(errno), (uintmax_t)len); \ - SCLogError(SC_ERR_FATAL, "Out of memory. The engine cannot be initialized. Exiting..."); \ - exit(EXIT_FAILURE); \ - } \ - } \ - (void*)ptrmem; \ -}) - #define SCFree(a) ({ \ free(a); \ })