summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2020-02-23 19:48:25 +0100
committerwm4 <wm4@nowhere>2020-02-23 19:48:25 +0100
commit0ec036bfd8b82339ea65278302a3b771648d7aff (patch)
tree737802d581fddef6f8c3a75318caf98c875f2bab
parent758082a1f20c130ae3babdc7bc68abc2f4b9f8df (diff)
downloadmpv-0ec036bfd8b82339ea65278302a3b771648d7aff.tar.bz2
mpv-0ec036bfd8b82339ea65278302a3b771648d7aff.tar.xz
ta: remove two pointless wrappers
-rw-r--r--player/client.c2
-rw-r--r--player/command.c2
-rw-r--r--ta/ta.h4
-rw-r--r--ta/ta_talloc.h2
4 files changed, 3 insertions, 7 deletions
diff --git a/player/client.c b/player/client.c
index 67087eac42..3122b880df 100644
--- a/player/client.c
+++ b/player/client.c
@@ -1141,7 +1141,7 @@ static void async_cmd_fn(void *data)
struct async_cmd_request *req = data;
struct mp_cmd *cmd = req->cmd;
- ta_xset_parent(cmd, NULL);
+ ta_set_parent(cmd, NULL);
req->cmd = NULL;
struct mp_abort_entry *abort = NULL;
diff --git a/player/command.c b/player/command.c
index 37ace97ba6..a66c7bdf2f 100644
--- a/player/command.c
+++ b/player/command.c
@@ -4284,7 +4284,7 @@ static void continue_cmd_list(struct cmd_list_ctx *list)
struct mp_cmd *sub = list->parent->args[0].v.p;
list->parent->args[0].v.p = sub->queue_next;
- ta_xset_parent(sub, NULL);
+ ta_set_parent(sub, NULL);
if (sub->flags & MP_ASYNC_CMD) {
// We run it "detached" (fire & forget)
diff --git a/ta/ta.h b/ta/ta.h
index 340394db0f..cc98cb7c5e 100644
--- a/ta/ta.h
+++ b/ta/ta.h
@@ -125,10 +125,6 @@ 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))
diff --git a/ta/ta_talloc.h b/ta/ta_talloc.h
index f2413c0112..982ef41ebd 100644
--- a/ta/ta_talloc.h
+++ b/ta/ta_talloc.h
@@ -37,7 +37,7 @@
#define talloc_steal ta_xsteal
#define talloc_realloc_size ta_xrealloc_size
#define talloc_new ta_xnew_context
-#define talloc_set_destructor ta_xset_destructor
+#define talloc_set_destructor ta_set_destructor
#define talloc_enable_leak_report ta_enable_leak_report
#define talloc_size ta_xalloc_size
#define talloc_zero_size ta_xzalloc_size