summaryrefslogtreecommitdiffstats
path: root/ta
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2018-01-18 10:08:48 +0100
committerKevin Mitchell <kevmitch@gmail.com>2018-01-18 01:42:36 -0800
commit6827901230a962ef40fbc18c6ab25d4d702b95aa (patch)
tree1c56f01ae57c3f1490bd3f79ed25daaafba15f43 /ta
parent4d87c700e007d6fbff1d742c0e6e6700451172e2 (diff)
downloadmpv-6827901230a962ef40fbc18c6ab25d4d702b95aa.tar.bz2
mpv-6827901230a962ef40fbc18c6ab25d4d702b95aa.tar.xz
ta: introduce talloc_dup() and use it in some places
It was actually already implemented as ta_dup_ptrtype(), but that seems like a clunky name. Also we still use the talloc_ names throughout the source, and I'd rather use an old name instead of a mixing inconsistent naming conventions.
Diffstat (limited to 'ta')
-rw-r--r--ta/ta.h4
-rw-r--r--ta/ta_talloc.h1
2 files changed, 3 insertions, 2 deletions
diff --git a/ta/ta.h b/ta/ta.h
index 4945aa2be7..18d8caf368 100644
--- a/ta/ta.h
+++ b/ta/ta.h
@@ -96,7 +96,7 @@ bool ta_vasprintf_append_buffer(char **str, const char *fmt, va_list ap) TA_PRF(
#define ta_steal(ta_parent, ptr) (TA_TYPEOF(ptr))ta_steal_(ta_parent, ptr)
-#define ta_dup_ptrtype(ta_parent, ptr) \
+#define ta_dup(ta_parent, ptr) \
(TA_TYPEOF(ptr))ta_memdup(ta_parent, ptr, sizeof(*(ptr)))
// Ugly macros that crash on OOM.
@@ -126,7 +126,7 @@ bool ta_vasprintf_append_buffer(char **str, const char *fmt, va_list ap) TA_PRF(
#define ta_xnew_array_size(...) ta_oom_p(ta_new_array_size(__VA_ARGS__))
#define ta_xnew_ptrtype(...) ta_oom_g(ta_new_ptrtype(__VA_ARGS__))
#define ta_xnew_array_ptrtype(...) ta_oom_g(ta_new_array_ptrtype(__VA_ARGS__))
-#define ta_xdup_ptrtype(...) ta_oom_g(ta_dup_ptrtype(__VA_ARGS__))
+#define ta_xdup(...) ta_oom_g(ta_dup(__VA_ARGS__))
#define ta_xsteal(ta_parent, ptr) (TA_TYPEOF(ptr))ta_xsteal_(ta_parent, ptr)
#define ta_xrealloc(ta_parent, ptr, type, count) \
diff --git a/ta/ta_talloc.h b/ta/ta_talloc.h
index 9ebedd94fd..bde25bc013 100644
--- a/ta/ta_talloc.h
+++ b/ta/ta_talloc.h
@@ -45,6 +45,7 @@
#define talloc_get_size ta_get_size
#define talloc_free_children ta_free_children
#define talloc_free ta_free
+#define talloc_dup ta_xdup
#define talloc_memdup ta_xmemdup
#define talloc_strdup ta_xstrdup
#define talloc_strndup ta_xstrndup