Mirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2025-12-28 05:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

ta: introduce talloc_dup() and use it in some places

Browse Source 
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.
This commit is contained in:
wm4
2018-01-18 10:08:48 +01:00
committed by Kevin Mitchell
parent 4d87c700e0
commit 6827901230
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
demux/demux.c
View File

@@ -1811,7 +1811,7 @@ static struct replaygain_data *decode_rgain(struct mp_log *log,
rg.album_gain = rg.track_gain; rg.album_gain = rg.track_gain;
rg.album_peak = rg.track_peak; rg.album_peak = rg.track_peak;
} }
return talloc_memdup(NULL, &rg, sizeof(rg)); return talloc_dup(NULL, &rg);
} }
if (decode_gain(log, tags, "REPLAYGAIN_GAIN", &rg.track_gain) >= 0 && if (decode_gain(log, tags, "REPLAYGAIN_GAIN", &rg.track_gain) >= 0 &&
@@ -1819,7 +1819,7 @@ static struct replaygain_data *decode_rgain(struct mp_log *log,
{ {
rg.album_gain = rg.track_gain; rg.album_gain = rg.track_gain;
rg.album_peak = rg.track_peak; rg.album_peak = rg.track_peak;
return talloc_memdup(NULL, &rg, sizeof(rg)); return talloc_dup(NULL, &rg);
} }
return NULL; return NULL;

5
demux/demux_mkv.c
View File

@@ -1076,7 +1076,7 @@ static int demux_mkv_read_tags(demuxer_t *demuxer)
if (ebml_read_element(s, &parse_ctx, &tags, &ebml_tags_desc) < 0) if (ebml_read_element(s, &parse_ctx, &tags, &ebml_tags_desc) < 0)
return -1; return -1;
mkv_d->tags = talloc_memdup(mkv_d, &tags, sizeof(tags)); mkv_d->tags = talloc_dup(mkv_d, &tags);
talloc_steal(mkv_d->tags, parse_ctx.talloc_ctx); talloc_steal(mkv_d->tags, parse_ctx.talloc_ctx);
return 0; return 0;
} }
@@ -2758,8 +2758,7 @@ static int read_block_group(demuxer_t *demuxer, int64_t end,
&ebml_block_additions_desc) < 0) &ebml_block_additions_desc) < 0)
return -1; return -1;
if (additions.n_block_more > 0) { if (additions.n_block_more > 0) {
block->additions = block->additions = talloc_dup(NULL, &additions);
talloc_memdup(NULL, &additions, sizeof(additions));
talloc_steal(block->additions, parse_ctx.talloc_ctx); talloc_steal(block->additions, parse_ctx.talloc_ctx);
parse_ctx.talloc_ctx = NULL; parse_ctx.talloc_ctx = NULL;
} }

6
input/cmd_parse.c
View File

@@ -356,7 +356,7 @@ mp_cmd_t *mp_input_parse_cmd_(struct mp_log *log, bstr str, const char *loc)
talloc_steal(list, cmd); talloc_steal(list, cmd);
struct mp_cmd_arg arg = {0}; struct mp_cmd_arg arg = {0};
arg.v.p = cmd; arg.v.p = cmd;
list->args = talloc_memdup(list, &arg, sizeof(arg)); list->args = talloc_dup(list, &arg);
p_prev = &cmd->queue_next; p_prev = &cmd->queue_next;
cmd = list; cmd = list;
} }
@@ -406,7 +406,7 @@ mp_cmd_t *mp_cmd_clone(mp_cmd_t *cmd)
if (!cmd) if (!cmd)
return NULL; return NULL;
ret = talloc_memdup(NULL, cmd, sizeof(mp_cmd_t)); ret = talloc_dup(NULL, cmd);
talloc_set_destructor(ret, destroy_cmd); talloc_set_destructor(ret, destroy_cmd);
ret->name = talloc_strdup(ret, cmd->name); ret->name = talloc_strdup(ret, cmd->name);
ret->args = talloc_zero_array(ret, struct mp_cmd_arg, ret->nargs); ret->args = talloc_zero_array(ret, struct mp_cmd_arg, ret->nargs);
@@ -427,7 +427,7 @@ mp_cmd_t *mp_cmd_clone(mp_cmd_t *cmd)
} else { } else {
struct mp_cmd_arg arg = {0}; struct mp_cmd_arg arg = {0};
arg.v.p = sub; arg.v.p = sub;
ret->args = talloc_memdup(ret, &arg, sizeof(arg)); ret->args = talloc_dup(ret, &arg);
} }
prev = sub; prev = sub;
} }

4
ta/ta.h
View File

@@ -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_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))) (TA_TYPEOF(ptr))ta_memdup(ta_parent, ptr, sizeof(*(ptr)))
// Ugly macros that crash on OOM. // 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_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_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_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_xsteal(ta_parent, ptr) (TA_TYPEOF(ptr))ta_xsteal_(ta_parent, ptr)
#define ta_xrealloc(ta_parent, ptr, type, count) \ #define ta_xrealloc(ta_parent, ptr, type, count) \

1
ta/ta_talloc.h
View File

@@ -45,6 +45,7 @@
#define talloc_get_size ta_get_size #define talloc_get_size ta_get_size
#define talloc_free_children ta_free_children #define talloc_free_children ta_free_children
#define talloc_free ta_free #define talloc_free ta_free
#define talloc_dup ta_xdup
#define talloc_memdup ta_xmemdup #define talloc_memdup ta_xmemdup
#define talloc_strdup ta_xstrdup #define talloc_strdup ta_xstrdup
#define talloc_strndup ta_xstrndup #define talloc_strndup ta_xstrndup

4
video/out/vo.c
View File

@@ -574,7 +574,7 @@ static void run_reconfig(void *p)
mp_image_params_get_dsize(params, &vo->dwidth, &vo->dheight); mp_image_params_get_dsize(params, &vo->dwidth, &vo->dheight);
talloc_free(vo->params); talloc_free(vo->params);
vo->params = talloc_memdup(vo, params, sizeof(*params)); vo->params = talloc_dup(vo, params);
*ret = vo->driver->reconfig(vo, vo->params); *ret = vo->driver->reconfig(vo, vo->params);
vo->config_ok = *ret >= 0; vo->config_ok = *ret >= 0;
@@ -632,7 +632,7 @@ void vo_control_async(struct vo *vo, int request, void *data)
switch (request) { switch (request) {
case VOCTRL_UPDATE_PLAYBACK_STATE: case VOCTRL_UPDATE_PLAYBACK_STATE:
d[2] = ta_xdup_ptrtype(d, (struct voctrl_playback_state *)data); d[2] = talloc_dup(d, (struct voctrl_playback_state *)data);
break; break;
case VOCTRL_KILL_SCREENSAVER: case VOCTRL_KILL_SCREENSAVER:
case VOCTRL_RESTORE_SCREENSAVER: case VOCTRL_RESTORE_SCREENSAVER: