]> git.ipfire.org Git - thirdparty/suricata.git/commitdiff
Remove SCStrndup
authorVictor Julien <victor@inliniac.net>
Fri, 31 Jan 2014 11:25:16 +0000 (12:25 +0100)
committerVictor Julien <victor@inliniac.net>
Fri, 31 Jan 2014 12:32:32 +0000 (13:32 +0100)
Removed strndup wrapper as it's not available in all plaforms.

src/util-mem.h

index 57f5312c5d30393f98e5d3148f1c1469dff4bef7..aaabd0158ce5ac8e14cdfaabb9aab7eaf5a115c6 100644 (file)
@@ -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); \
 })