mirror of
https://github.com/mpv-player/mpv
synced 2024-12-28 18:12:22 +00:00
ta: remove two pointless wrappers
This commit is contained in:
parent
758082a1f2
commit
0ec036bfd8
@ -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;
|
||||
|
@ -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)
|
||||
|
4
ta/ta.h
4
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))
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user