ta: inline OOM checks

It makes no sense to force function call for simple check.

2 files changed, 20 insertions, 24 deletions

diff --git a/ta/ta.h b/ta/ta.h
index 4baac8fb40..485f38f58b 100644
--- a/ta/ta.h
+++ b/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)
 
diff --git a/ta/ta_utils.c b/ta/ta_utils.c
index 62469686db..294ad8d7f2 100644
--- a/ta/ta_utils.c
+++ b/ta/ta_utils.c
@@ -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);