From fd422008b748664c8b5dee8dd6233193a83f2869 Mon Sep 17 00:00:00 2001 From: Max Lv Date: Sun, 5 Jun 2016 14:45:01 +0800 Subject: [PATCH] Avoid linking issues on Android --- src/utils.c | 20 ++++++++++++++++++++ src/utils.h | 22 +++------------------- 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/src/utils.c b/src/utils.c index 04d0eec5..57018247 100644 --- a/src/utils.c +++ b/src/utils.c @@ -185,6 +185,26 @@ void FATAL(const char *msg) exit(-1); } +void *ss_malloc(size_t size) +{ + void *tmp = malloc(size); + if (tmp == NULL) + exit(EXIT_FAILURE); + return tmp; +} + +void *ss_realloc(void *ptr, size_t new_size) +{ + void *new = realloc(ptr, new_size); + if (new == NULL) { + free(ptr); + ptr = NULL; + exit(EXIT_FAILURE); + } + return new; +} + + void usage() { printf("\n"); diff --git a/src/utils.h b/src/utils.h index 2e4181a8..434d3577 100644 --- a/src/utils.h +++ b/src/utils.h @@ -203,29 +203,13 @@ char *ss_strndup(const char *s, size_t n); int set_nofile(int nofile); #endif +void *ss_malloc(size_t size); +void *ss_realloc(void *ptr, size_t new_size); + #define ss_free(ptr) \ do { \ free(ptr); \ ptr = NULL; \ } while(0) -inline void *ss_malloc(size_t size) -{ - void *tmp = malloc(size); - if (tmp == NULL) - exit(EXIT_FAILURE); - return tmp; -} - -inline void *ss_realloc(void *ptr, size_t new_size) -{ - void *new = realloc(ptr, new_size); - if (new == NULL) { - free(ptr); - ptr = NULL; - exit(EXIT_FAILURE); - } - return new; -} - #endif // _UTILS_H