mirror of
https://github.com/mpv-player/mpv.git
synced 2024-09-19 19:42:24 +02:00
ta: inline OOM checks
It makes no sense to force function call for simple check.
This commit is contained in:
parent
50bc9dd523
commit
92c81e9666
23
ta/ta.h
23
ta/ta.h
@ -144,9 +144,26 @@ void *ta_xrealloc_size(void *ta_parent, void *ptr, size_t size);
|
||||
#define ta_xrealloc_size(...) ta_dbg_set_loc(ta_xrealloc_size(__VA_ARGS__), TA_LOC)
|
||||
#endif
|
||||
|
||||
void ta_oom_b(bool b);
|
||||
char *ta_oom_s(char *s);
|
||||
void *ta_oom_p(void *p);
|
||||
static inline void *ta_oom_p(void *p)
|
||||
{
|
||||
if (!p)
|
||||
abort();
|
||||
return p;
|
||||
}
|
||||
|
||||
static inline void ta_oom_b(bool b)
|
||||
{
|
||||
if (!b)
|
||||
abort();
|
||||
}
|
||||
|
||||
static inline char *ta_oom_s(char *s)
|
||||
{
|
||||
if (!s)
|
||||
abort();
|
||||
return s;
|
||||
}
|
||||
|
||||
// Generic pointer
|
||||
#define ta_oom_g(ptr) (TA_TYPEOF(ptr))ta_oom_p(ptr)
|
||||
|
||||
|
@ -265,27 +265,6 @@ bool ta_vasprintf_append_buffer(char **str, const char *fmt, va_list ap)
|
||||
return ta_vasprintf_append_at(str, size, fmt, ap);
|
||||
}
|
||||
|
||||
|
||||
void *ta_oom_p(void *p)
|
||||
{
|
||||
if (!p)
|
||||
abort();
|
||||
return p;
|
||||
}
|
||||
|
||||
void ta_oom_b(bool b)
|
||||
{
|
||||
if (!b)
|
||||
abort();
|
||||
}
|
||||
|
||||
char *ta_oom_s(char *s)
|
||||
{
|
||||
if (!s)
|
||||
abort();
|
||||
return s;
|
||||
}
|
||||
|
||||
void *ta_xmemdup(void *ta_parent, void *ptr, size_t size)
|
||||
{
|
||||
void *new = ta_memdup(ta_parent, ptr, size);
|
||||
|
Loading…
Reference in New Issue
Block a user