mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-12-25 03:00:46 +00:00
Clean up the "X" variants of malloc and friends to avoid unncessary function calls and parameter passing
git-svn-id: https://svn.eduke32.com/eduke32@4619 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
53ed4c619c
commit
3623645815
2 changed files with 45 additions and 50 deletions
|
@ -43,7 +43,7 @@
|
|||
#ifndef __STDC_LIMIT_MACROS
|
||||
#define __STDC_LIMIT_MACROS
|
||||
#endif
|
||||
#ifdef HAVE_INTTYPES
|
||||
#if defined(HAVE_INTTYPES) || defined(__cplusplus)
|
||||
# include <stdint.h>
|
||||
# include <inttypes.h>
|
||||
|
||||
|
@ -796,10 +796,43 @@ static inline void append_ext_UNSAFE(char *outbuf, const char *ext)
|
|||
extern void xalloc_set_location(int32_t line, const char *file, const char *func);
|
||||
#endif
|
||||
void set_memerr_handler(void (*handlerfunc)(int32_t, const char *, const char *));
|
||||
char *xstrdup(const char *s);
|
||||
void *xmalloc(bsize_t size);
|
||||
void *xcalloc(bsize_t nmemb, bsize_t size);
|
||||
void *xrealloc(void *ptr, bsize_t size);
|
||||
void handle_memerr(void);
|
||||
|
||||
static inline char *xstrdup(const char *s)
|
||||
{
|
||||
char *ptr = Bstrdup(s);
|
||||
if (ptr == NULL) handle_memerr();
|
||||
return ptr;
|
||||
}
|
||||
|
||||
static inline void *xmalloc(const bsize_t size)
|
||||
{
|
||||
void *ptr = Bmalloc(size);
|
||||
if (ptr == NULL) handle_memerr();
|
||||
return ptr;
|
||||
}
|
||||
|
||||
static inline void *xcalloc(const bsize_t nmemb, const bsize_t size)
|
||||
{
|
||||
void *ptr = Bcalloc(nmemb, size);
|
||||
if (ptr == NULL) handle_memerr();
|
||||
return ptr;
|
||||
}
|
||||
|
||||
static inline void *xrealloc(void * const ptr, const bsize_t size)
|
||||
{
|
||||
void *newptr = Brealloc(ptr, size);
|
||||
|
||||
// According to the C Standard,
|
||||
// - ptr == NULL makes realloc() behave like malloc()
|
||||
// - size == 0 make it behave like free() if ptr != NULL
|
||||
// Since we want to catch an out-of-mem in the first case, this leaves:
|
||||
if (newptr == NULL && size != 0)
|
||||
handle_memerr();
|
||||
|
||||
return newptr;
|
||||
}
|
||||
|
||||
|
||||
#ifdef EXTERNC
|
||||
}
|
||||
|
|
|
@ -64,10 +64,8 @@ void xalloc_set_location(int32_t line, const char *file, const char *func)
|
|||
}
|
||||
#endif
|
||||
|
||||
static void handle_potential_memerr(void *ptr)
|
||||
void handle_memerr(void)
|
||||
{
|
||||
if (ptr == NULL)
|
||||
{
|
||||
if (g_MemErrHandler)
|
||||
{
|
||||
#ifdef DEBUGGINGAIDS
|
||||
|
@ -78,49 +76,13 @@ static void handle_potential_memerr(void *ptr)
|
|||
}
|
||||
|
||||
Bexit(EXIT_FAILURE);
|
||||
}
|
||||
}
|
||||
|
||||
void set_memerr_handler(void (*handlerfunc)(int32_t, const char *, const char *))
|
||||
void set_memerr_handler(void(*handlerfunc)(int32_t, const char *, const char *))
|
||||
{
|
||||
g_MemErrHandler = handlerfunc;
|
||||
}
|
||||
|
||||
char *xstrdup(const char *s)
|
||||
{
|
||||
char *ptr = Bstrdup(s);
|
||||
handle_potential_memerr(ptr);
|
||||
return ptr;
|
||||
}
|
||||
|
||||
void *xmalloc(bsize_t size)
|
||||
{
|
||||
void *ptr = Bmalloc(size);
|
||||
handle_potential_memerr(ptr);
|
||||
return ptr;
|
||||
}
|
||||
|
||||
void *xcalloc(bsize_t nmemb, bsize_t size)
|
||||
{
|
||||
void *ptr = Bcalloc(nmemb, size);
|
||||
handle_potential_memerr(ptr);
|
||||
return ptr;
|
||||
}
|
||||
|
||||
void *xrealloc(void *ptr, bsize_t size)
|
||||
{
|
||||
void *newptr = Brealloc(ptr, size);
|
||||
|
||||
// According to the C Standard,
|
||||
// - ptr == NULL makes realloc() behave like malloc()
|
||||
// - size == 0 make it behave like free() if ptr != NULL
|
||||
// Since we want to catch an out-of-mem in the first case, this leaves:
|
||||
if (size != 0)
|
||||
handle_potential_memerr(newptr);
|
||||
|
||||
return newptr;
|
||||
}
|
||||
|
||||
//////////
|
||||
|
||||
#ifndef __compat_h_macrodef__
|
||||
|
|
Loading…
Reference in a new issue