summaryrefslogtreecommitdiffstats
path: root/ta/ta.h
diff options
context:
space:
mode:
Diffstat (limited to 'ta/ta.h')
-rw-r--r--ta/ta.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/ta/ta.h b/ta/ta.h
index 4450795be8..340394db0f 100644
--- a/ta/ta.h
+++ b/ta/ta.h
@@ -50,8 +50,8 @@ void *ta_realloc_size(void *ta_parent, void *ptr, size_t size);
size_t ta_get_size(void *ptr);
void ta_free(void *ptr);
void ta_free_children(void *ptr);
-bool ta_set_destructor(void *ptr, void (*destructor)(void *));
-bool ta_set_parent(void *ptr, void *ta_parent);
+void ta_set_destructor(void *ptr, void (*destructor)(void *));
+void ta_set_parent(void *ptr, void *ta_parent);
// Utility functions
size_t ta_calc_array_size(size_t element_size, size_t count);
@@ -105,8 +105,6 @@ bool ta_vasprintf_append_buffer(char **str, const char *fmt, va_list ap) TA_PRF(
// code.
#define ta_xalloc_size(...) ta_oom_p(ta_alloc_size(__VA_ARGS__))
#define ta_xzalloc_size(...) ta_oom_p(ta_zalloc_size(__VA_ARGS__))
-#define ta_xset_destructor(...) ta_oom_b(ta_set_destructor(__VA_ARGS__))
-#define ta_xset_parent(...) ta_oom_b(ta_set_parent(__VA_ARGS__))
#define ta_xnew_context(...) ta_oom_p(ta_new_context(__VA_ARGS__))
#define ta_xstrdup_append(...) ta_oom_b(ta_strdup_append(__VA_ARGS__))
#define ta_xstrdup_append_buffer(...) ta_oom_b(ta_strdup_append_buffer(__VA_ARGS__))
@@ -127,6 +125,10 @@ bool ta_vasprintf_append_buffer(char **str, const char *fmt, va_list ap) TA_PRF(
#define ta_xnew_array_ptrtype(...) ta_oom_g(ta_new_array_ptrtype(__VA_ARGS__))
#define ta_xdup(...) ta_oom_g(ta_dup(__VA_ARGS__))
+// Cannot fail anymore.
+#define ta_xset_destructor(...) ta_set_destructor(__VA_ARGS__)
+#define ta_xset_parent(...) ta_set_parent(__VA_ARGS__)
+
#define ta_xsteal(ta_parent, ptr) (TA_TYPEOF(ptr))ta_xsteal_(ta_parent, ptr)
#define ta_xrealloc(ta_parent, ptr, type, count) \
(type *)ta_xrealloc_size(ta_parent, ptr, ta_calc_array_size(sizeof(type), count))