Browse Source

Avoid linking issues on Android

pull/666/head
Max Lv 9 years ago
parent
commit
fd422008b7
2 changed files with 23 additions and 19 deletions
  1. 20
      src/utils.c
  2. 22
      src/utils.h

20
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");

22
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
Loading…
Cancel
Save