diff options
| -rwxr-xr-x | configure | 5 | ||||
| -rw-r--r-- | libmpdemux/demux_lavf.c | 1 | ||||
| -rw-r--r-- | libvo/vo_x11.c | 2 | ||||
| -rw-r--r-- | libvo/vo_xv.c | 2 | ||||
| -rw-r--r-- | libvo/x11_common.c | 37 | ||||
| -rw-r--r-- | libvo/x11_common.h | 2 | ||||
| -rw-r--r-- | m_config.c | 810 | ||||
| -rw-r--r-- | m_config.h | 227 | ||||
| -rw-r--r-- | m_option.c | 177 | ||||
| -rw-r--r-- | mplayer.c | 3 | ||||
| -rw-r--r-- | path.c | 16 |
11 files changed, 601 insertions, 681 deletions
@@ -2324,6 +2324,7 @@ elif test -z "$CFLAGS" ; then else CFLAGS="-O2 $_march $_mcpu $_pipe -ffast-math -fomit-frame-pointer" WARNFLAGS="-Wall -Wno-switch -Wno-parentheses -Wpointer-arith -Wredundant-decls" + ERRORFLAGS="-Werror-implicit-function-declaration" extra_ldflags="$extra_ldflags -ffast-math" fi else @@ -6655,8 +6656,8 @@ INSTALL = $_install INSTALLSTRIP = $_install_strip WINDRES = $_windres -CFLAGS = $WARNFLAGS $WARN_CFLAGS $CFLAGS $extra_cflags -CXXFLAGS = $WARNFLAGS $CXXFLAGS $extra_cflags $extra_cxxflags +CFLAGS = $WARNFLAGS $ERRORFLAGS $WARN_CFLAGS $CFLAGS $extra_cflags +CXXFLAGS = $WARNFLAGS $ERRORFLAGS $CXXFLAGS $extra_cflags $extra_cxxflags DEPFLAGS = $DEPFLAGS CFLAGS_LIBDVDCSS = $cflags_libdvdcss diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c index 0be7679cd2..efda65a14d 100644 --- a/libmpdemux/demux_lavf.c +++ b/libmpdemux/demux_lavf.c @@ -42,6 +42,7 @@ #include "libavformat/avio.h" #include "libavutil/avutil.h" #include "libavutil/avstring.h" +#include <libavutil/mathematics.h> #include "libavcodec/opt.h" #include "mp_taglists.h" diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c index 8e34503bb9..9be47c9d8a 100644 --- a/libvo/vo_x11.c +++ b/libvo/vo_x11.c @@ -103,7 +103,7 @@ static void check_events(void) vo_x11_clearwindow(mDisplay, vo_window); else if (ret & VO_EVENT_EXPOSE) vo_x11_clearwindow_part(mDisplay, vo_window, myximage->width, - myximage->height, 0); + myximage->height); if (ret & VO_EVENT_EXPOSE && int_pause) flip_page(); } diff --git a/libvo/vo_xv.c b/libvo/vo_xv.c index cecbc68b7e..64324c9785 100644 --- a/libvo/vo_xv.c +++ b/libvo/vo_xv.c @@ -187,7 +187,7 @@ static void resize(struct vo *vo) calc_src_dst_rects(vo, ctx->image_width, ctx->image_height, &ctx->src_rect, &ctx->dst_rect, NULL, NULL); struct vo_rect *dst = &ctx->dst_rect; - vo_x11_clearwindow_part(vo, vo->x11->window, dst->width, dst->height, 1); + vo_x11_clearwindow_part(vo, vo->x11->window, dst->width, dst->height); vo_xv_draw_colorkey(vo, dst->left, dst->top, dst->width, dst->height); } diff --git a/libvo/x11_common.c b/libvo/x11_common.c index 0a193fb0d3..0ad2a30dd9 100644 --- a/libvo/x11_common.c +++ b/libvo/x11_common.c @@ -1099,13 +1099,12 @@ void vo_x11_create_vo_window(struct vo *vo, XVisualInfo *vis, int x, int y, XSetStandardProperties(mDisplay, x11->window, title, title, None, NULL, 0, &hint); if (!vo_border) vo_x11_decoration(vo, 0); // map window - XMapWindow(mDisplay, x11->window); - vo_x11_clearwindow(vo, x11->window); XSelectInput(mDisplay, x11->window, NoEventMask); - XSync(mDisplay, False); vo_x11_selectinput_witherr(mDisplay, x11->window, StructureNotifyMask | KeyPressMask | PointerMotionMask | ButtonPressMask | ButtonReleaseMask | ExposureMask); + XMapWindow(mDisplay, x11->window); + vo_x11_clearwindow(vo, x11->window); } if (opts->vo_ontop) vo_x11_setlayer(vo, x11->window, opts->vo_ontop); vo_x11_update_geometry(vo, !geometry_xy_changed); @@ -1129,18 +1128,17 @@ final: } void vo_x11_clearwindow_part(struct vo *vo, Window vo_window, - int img_width, int img_height, int use_fs) + int img_width, int img_height) { struct vo_x11_state *x11 = vo->x11; - struct MPOpts *opts = vo->opts; Display *mDisplay = vo->x11->display; int u_dheight, u_dwidth, left_ov, left_ov2; if (x11->f_gc == None) return; - u_dheight = use_fs ? opts->vo_screenheight : vo->dheight; - u_dwidth = use_fs ? opts->vo_screenwidth : vo->dwidth; + u_dheight = vo->dheight; + u_dwidth = vo->dwidth; if ((u_dheight <= img_height) && (u_dwidth <= img_width)) return; @@ -2302,7 +2300,6 @@ int vo_xv_init_colorkey(struct vo *vo) void vo_xv_draw_colorkey(struct vo *vo, int32_t x, int32_t y, int32_t w, int32_t h) { - struct MPOpts *opts = vo->opts; struct vo_x11_state *x11 = vo->x11; if( x11->xv_ck_info.method == CK_METHOD_MANUALFILL || x11->xv_ck_info.method == CK_METHOD_BACKGROUND )//less tearing than XClearWindow() @@ -2312,30 +2309,6 @@ void vo_xv_draw_colorkey(struct vo *vo, int32_t x, int32_t y, x, y, w, h ); } - - /* draw black bars if needed */ - /* TODO! move this to vo_x11_clearwindow_part() */ - if ( vo_fs ) - { - XSetForeground(x11->display, x11->vo_gc, 0 ); - /* making non-overlap fills, requires 8 checks instead of 4 */ - if ( y > 0 ) - XFillRectangle(x11->display, x11->window, x11->vo_gc, - 0, 0, - opts->vo_screenwidth, y); - if (x > 0) - XFillRectangle(x11->display, x11->window, x11->vo_gc, - 0, 0, - x, opts->vo_screenheight); - if (x + w < opts->vo_screenwidth) - XFillRectangle(x11->display, x11->window, x11->vo_gc, - x + w, 0, - opts->vo_screenwidth, opts->vo_screenheight); - if (y + h < opts->vo_screenheight) - XFillRectangle(x11->display, x11->window, x11->vo_gc, - 0, y + h, - opts->vo_screenwidth, opts->vo_screenheight); - } } /** \brief Tests if a valid argument for the ck suboption was given. */ diff --git a/libvo/x11_common.h b/libvo/x11_common.h index ba3d0e2617..ab5188159c 100644 --- a/libvo/x11_common.h +++ b/libvo/x11_common.h @@ -137,7 +137,7 @@ void vo_x11_create_vo_window(struct vo *vo, XVisualInfo *vis, int x, int y, unsigned int width, unsigned int height, int flags, Colormap col_map, const char *classname, const char *title); void vo_x11_clearwindow_part(struct vo *vo, Window vo_window, - int img_width, int img_height, int use_fs); + int img_width, int img_height); void vo_x11_clearwindow(struct vo *vo, Window vo_window); void vo_x11_ontop(struct vo *vo); void vo_x11_border(struct vo *vo); diff --git a/m_config.c b/m_config.c index 914bfcecb7..47e893717c 100644 --- a/m_config.c +++ b/m_config.c @@ -26,9 +26,7 @@ #include <errno.h> #include <string.h> #include "talloc.h" -#ifdef MP_DEBUG #include <assert.h> -#endif #include "m_config.h" #include "m_option.h" @@ -36,24 +34,25 @@ #define MAX_PROFILE_DEPTH 20 -static int parse_profile(const m_option_t *opt, const char *name, +static int parse_profile(const struct m_option *opt, const char *name, const char *param, void *dst, int src) { - m_config_t *config = opt->priv; + struct m_config *config = opt->priv; char **list = NULL; int i, r; if (param && !strcmp(param, "help")) { - m_profile_t *p; + struct m_profile *p; if (!config->profiles) { - mp_tmsg(MSGT_CFGPARSER, MSGL_INFO, "No profiles have been defined.\n"); - return M_OPT_EXIT-1; + mp_tmsg(MSGT_CFGPARSER, MSGL_INFO, + "No profiles have been defined.\n"); + return M_OPT_EXIT - 1; } mp_tmsg(MSGT_CFGPARSER, MSGL_INFO, "Available profiles:\n"); for (p = config->profiles; p; p = p->next) mp_msg(MSGT_CFGPARSER, MSGL_INFO, "\t%s\t%s\n", p->name, p->desc ? p->desc : ""); mp_msg(MSGT_CFGPARSER, MSGL_INFO, "\n"); - return M_OPT_EXIT-1; + return M_OPT_EXIT - 1; } r = m_option_type_string_list.parse(opt, name, param, &list, src); @@ -62,7 +61,7 @@ static int parse_profile(const m_option_t *opt, const char *name, if (!list || !list[0]) return M_OPT_INVALID; for (i = 0; list[i]; i++) - if (!m_config_get_profile(config,list[i])) { + if (!m_config_get_profile(config, list[i])) { mp_tmsg(MSGT_CFGPARSER, MSGL_WARN, "Unknown profile '%s'.\n", list[i]); r = M_OPT_INVALID; @@ -74,13 +73,13 @@ static int parse_profile(const m_option_t *opt, const char *name, return r; } -static void set_profile(const m_option_t *opt, void *dst, const void *src) +static void set_profile(const struct m_option *opt, void *dst, const void *src) { - m_config_t *config = opt->priv; - m_profile_t *p; + struct m_config *config = opt->priv; + struct m_profile *p; char **list = NULL; int i; - if (!src || !*(char***)src) + if (!src || !*(char ***)src) return; m_option_copy(opt, &list, src); for (i = 0; list[i]; i++) { @@ -92,10 +91,10 @@ static void set_profile(const m_option_t *opt, void *dst, const void *src) m_option_free(opt, &list); } -static int show_profile(m_option_t *opt, char* name, char *param) +static int show_profile(struct m_option *opt, char *name, char *param) { - m_config_t *config = opt->priv; - m_profile_t *p; + struct m_config *config = opt->priv; + struct m_profile *p; int i, j; if (!param) return M_OPT_MISSING_PARAM; @@ -120,14 +119,14 @@ static int show_profile(m_option_t *opt, char* name, char *param) && !strcmp(p->opts[2*i], "profile")) { char *e, *list = p->opts[2 * i + 1]; while ((e = strchr(list, ','))) { - int l = e-list; + int l = e - list; char tmp[l+1]; if (!l) continue; memcpy(tmp, list, l); tmp[l] = '\0'; show_profile(opt, name, tmp); - list = e+1; + list = e + 1; } if (list[0] != '\0') show_profile(opt, name, list); @@ -139,15 +138,15 @@ static int show_profile(m_option_t *opt, char* name, char *param) return M_OPT_EXIT - 1; } -static int list_options(m_option_t *opt, char *name, char *param) +static int list_options(struct m_option *opt, char *name, char *param) { - m_config_t *config = opt->priv; + struct m_config *config = opt->priv; m_config_print_option_list(config); return M_OPT_EXIT; } -static void m_option_save(const m_config_t *config, const m_option_t *opt, - void *dst) +static void m_option_save(const struct m_config *config, + const struct m_option *opt, void *dst) { if (opt->type->save) { const void *src = m_option_get_ptr(opt, config->optstruct); @@ -155,8 +154,8 @@ static void m_option_save(const m_config_t *config, const m_option_t *opt, } } -static void m_option_set(const m_config_t *config, const m_option_t *opt, - const void *src) +static void m_option_set(const struct m_config *config, + const struct m_option *opt, const void *src) { if (opt->type->set) { void *dst = m_option_get_ptr(opt, config->optstruct); @@ -166,438 +165,457 @@ static void m_option_set(const m_config_t *config, const m_option_t *opt, -static void -m_config_add_option(m_config_t *config, const m_option_t *arg, const char* prefix); +static void m_config_add_option(struct m_config *config, + const struct m_option *arg, + const char *prefix); -m_config_t *m_config_new(void *optstruct, - int includefunc(m_option_t *conf, char *filename)) +struct m_config *m_config_new(void *optstruct, + int includefunc(struct m_option *conf, + char *filename)) { - m_config_t* config; - static int initialized = 0; - static m_option_type_t profile_opt_type; - static const m_option_t ref_opts[] = { - { "profile", NULL, &profile_opt_type, CONF_NOSAVE, 0, 0, NULL }, - { "show-profile", show_profile, CONF_TYPE_PRINT_FUNC, CONF_NOCFG, 0, 0, NULL }, - { "list-options", list_options, CONF_TYPE_PRINT_FUNC, CONF_NOCFG, 0, 0, NULL }, - { NULL, NULL, NULL, 0, 0, 0, NULL } - }; - int i; - - config = talloc_zero(NULL, m_config_t); - config->lvl = 1; // 0 Is the defaults - if(!initialized) { - initialized = 1; - profile_opt_type = m_option_type_string_list; - profile_opt_type.parse = parse_profile; - profile_opt_type.set = set_profile; - } - m_option_t *self_opts = talloc_memdup(config, ref_opts, sizeof(ref_opts)); - for (i = 0; self_opts[i].name; i++) - self_opts[i].priv = config; - m_config_register_options(config, self_opts); - if (includefunc) { - struct m_option *p = talloc_ptrtype(config, p); - *p = (struct m_option){"include", includefunc, CONF_TYPE_FUNC_PARAM, - CONF_NOSAVE, 0, 0, config}; - m_config_add_option(config, p, NULL); - } - config->optstruct = optstruct; - - return config; + struct m_config *config; + static int initialized = 0; + static struct m_option_type profile_opt_type; + static const struct m_option ref_opts[] = { + { "profile", NULL, &profile_opt_type, CONF_NOSAVE, 0, 0, NULL }, + { "show-profile", show_profile, CONF_TYPE_PRINT_FUNC, CONF_NOCFG }, + { "list-options", list_options, CONF_TYPE_PRINT_FUNC, CONF_NOCFG }, + { NULL } + }; + int i; + + config = talloc_zero(NULL, struct m_config); + config->lvl = 1; // 0 Is the defaults + if (!initialized) { + initialized = 1; + profile_opt_type = m_option_type_string_list; + profile_opt_type.parse = parse_profile; + profile_opt_type.set = set_profile; + } + struct m_option *self_opts = talloc_memdup(config, ref_opts, + sizeof(ref_opts)); + for (i = 0; self_opts[i].name; i++) + self_opts[i].priv = config; + m_config_register_options(config, self_opts); + if (includefunc) { + struct m_option *p = talloc_ptrtype(config, p); + *p = (struct m_option){ + "include", includefunc, CONF_TYPE_FUNC_PARAM, + CONF_NOSAVE, 0, 0, config + }; + m_config_add_option(config, p, NULL); + } + config->optstruct = optstruct; + + return config; } -void m_config_free(m_config_t* config) +void m_config_free(struct m_config *config) { - m_config_option_t *opt; - for (opt = config->opts; opt; opt = opt->next) { - if (opt->flags & M_CFG_OPT_ALIAS) + struct m_config_option *copt; + for (copt = config->opts; copt; copt = copt->next) { + if (copt->flags & M_CFG_OPT_ALIAS) continue; - m_config_save_slot_t *sl; - for (sl = opt->slots; sl; sl = sl->prev) - m_option_free(opt->opt, sl->data); + if (copt->opt->type->flags & M_OPT_TYPE_DYNAMIC) { + void *ptr = m_option_get_ptr(copt->opt, config->optstruct); + if (ptr) + m_option_free(copt->opt, ptr); + } + struct m_config_save_slot *sl; + for (sl = copt->slots; sl; sl = sl->prev) + m_option_free(copt->opt, sl->data); } talloc_free(config); } -void -m_config_push(m_config_t* config) { - m_config_option_t *co; - m_config_save_slot_t *slot; +void m_config_push(struct m_config *config) +{ + struct m_config_option *co; + struct m_config_save_slot *slot; -#ifdef MP_DEBUG - assert(config != NULL); - assert(config->lvl > 0); -#endif + assert(config != NULL); + assert(config->lvl > 0); - config->lvl++; + config->lvl++; - for(co = config->opts ; co ; co = co->next ) { - if(co->opt->type->flags & M_OPT_TYPE_HAS_CHILD) - continue; - if(co->opt->flags & (M_OPT_GLOBAL|M_OPT_NOSAVE)) - continue; - if(co->flags & M_CFG_OPT_ALIAS) - continue; + for (co = config->opts; co; co = co->next) { + if (co->opt->type->flags & M_OPT_TYPE_HAS_CHILD) + continue; + if (co->opt->flags & (M_OPT_GLOBAL | M_OPT_NOSAVE)) + continue; + if (co->flags & M_CFG_OPT_ALIAS) + continue; - // Update the current status - m_option_save(config, co->opt, co->slots->data); + // Update the current status + m_option_save(config, co->opt, co->slots->data); - // Allocate a new slot - slot = talloc_zero_size(co, sizeof(m_config_save_slot_t) + + // Allocate a new slot + slot = talloc_zero_size(co, sizeof(struct m_config_save_slot) + co->opt->type->size); - slot->lvl = config->lvl; - slot->prev = co->slots; - co->slots = slot; - m_option_copy(co->opt,co->slots->data,co->slots->prev->data); - // Reset our set flag - co->flags &= ~M_CFG_OPT_SET; - } - - mp_msg(MSGT_CFGPARSER, MSGL_DBG2,"Config pushed level is now %d\n",config->lvl); + slot->lvl = config->lvl; + slot->prev = co->slots; + co->slots = slot; + m_option_copy(co->opt, co->slots->data, co->slots->prev->data); + // Reset our set flag + co->flags &= ~M_CFG_OPT_SET; + } + + mp_msg(MSGT_CFGPARSER, MSGL_DBG2, + "Config pushed level is now %d\n", config->lvl); } -void -m_config_pop(m_config_t* config) { - m_config_option_t *co; - m_config_save_slot_t *slot; - -#ifdef MP_DEBUG - assert(config != NULL); - assert(config->lvl > 1); -#endif - - for(co = config->opts ; co ; co = co->next ) { - int pop = 0; - if(co->opt->type->flags & M_OPT_TYPE_HAS_CHILD) - continue; - if(co->opt->flags & (M_OPT_GLOBAL|M_OPT_NOSAVE)) - continue; - if(co->flags & M_CFG_OPT_ALIAS) - continue; - if(co->slots->lvl > config->lvl) - mp_tmsg(MSGT_CFGPARSER, MSGL_WARN,"Save slot found from lvl %d is too old: %d !!!\n",config->lvl,co->slots->lvl); - - while(co->slots->lvl >= config->lvl) { - m_option_free(co->opt,co->slots->data); - slot = co->slots; - co->slots = slot->prev; - talloc_free(slot); - pop++; +void m_config_pop(struct m_config *config) +{ + struct m_config_option *co; + struct m_config_save_slot *slot; + + assert(config != NULL); + assert(config->lvl > 1); + + for (co = config->opts; co; co = co->next) { + int pop = 0; + if (co->opt->type->flags & M_OPT_TYPE_HAS_CHILD) + continue; + if (co->opt->flags & (M_OPT_GLOBAL | M_OPT_NOSAVE)) + continue; + if (co->flags & M_CFG_OPT_ALIAS) + continue; + if (co->slots->lvl > config->lvl) + mp_msg(MSGT_CFGPARSER, MSGL_WARN, + "Save slot found from lvl %d is too old: %d !!!\n", + config->lvl, co->slots->lvl); + + while (co->slots->lvl >= config->lvl) { + m_option_free(co->opt, co->slots->data); + slot = co->slots; + co->slots = slot->prev; + talloc_free(slot); + pop++; + } + if (pop) // We removed some ctx -> set the previous value + m_option_set(config, co->opt, co->slots->data); } - if(pop) // We removed some ctx -> set the previous value - m_option_set(config, co->opt, co->slots->data); - } - config->lvl--; - mp_msg(MSGT_CFGPARSER, MSGL_DBG2,"Config poped level=%d\n",config->lvl); + config->lvl--; + mp_msg(MSGT_CFGPARSER, MSGL_DBG2, "Config poped level=%d\n", config->lvl); } -static void -m_config_add_option(m_config_t *config, const m_option_t *arg, const char* prefix) { - m_config_option_t *co; - m_config_save_slot_t* sl; - -#ifdef MP_DEBUG - assert(config != NULL); - assert(config->lvl > 0); - assert(arg != NULL); -#endif - - // Allocate a new entry for this option - co = talloc_zero_size(config, sizeof(m_config_option_t) + arg->type->size); - co->opt = arg; - - // Fill in the full name - if (prefix && *prefix) - co->name = talloc_asprintf(co, "%s:%s", prefix, arg->name); - else - co->name = (char *)arg->name; - - // Option with children -> add them - if(arg->type->flags & M_OPT_TYPE_HAS_CHILD) { - const m_option_t *ol = arg->p; - int i; - co->slots = NULL; - for(i = 0 ; ol[i].name != NULL ; i++) - m_config_add_option(config,&ol[i], co->name); - } else { - m_config_option_t *i; - // Check if there is already an option pointing to this address - if(arg->p || arg->new && arg->offset >= 0) { - for(i = config->opts ; i ; i = i->next ) { - if (arg->new ? (i->opt->new && i->opt->offset == arg->offset) - : (!i->opt->new && i->opt->p == arg->p)) { - // So we don't save the same vars more than 1 time - co->slots = i->slots; - co->flags |= M_CFG_OPT_ALIAS; - break; - } - } - } - if(!(co->flags & M_CFG_OPT_ALIAS)) { - // Allocate a slot for the defaults - sl = talloc_zero_size(co, sizeof(m_config_save_slot_t) + - arg->type->size); - m_option_save(config, arg, sl->data); - // Hack to avoid too much trouble with dynamically allocated data : - // We always use a dynamic version - if ((arg->type->flags & M_OPT_TYPE_DYNAMIC)) { - char **hackptr = arg->new ? (char*)config->optstruct + arg->offset - : arg->p; - if (hackptr && *hackptr) { - *hackptr = NULL; - m_option_set(config, arg, sl->data); +static void m_config_add_option(struct m_config *config, + const struct m_option *arg, const char *prefix) +{ + struct m_config_option *co; + struct m_config_save_slot *sl; + + assert(config != NULL); + assert(config->lvl > 0); + assert(arg != NULL); + + // Allocate a new entry for this option + co = talloc_zero_size(config, + sizeof(struct m_config_option) + arg->type->size); + co->opt = arg; + + // Fill in the full name + if (prefix && *prefix) + co->name = talloc_asprintf(co, "%s:%s", prefix, arg->name); + else + co->name = (char *)arg->name; + + // Option with children -> add them + if (arg->type->flags & M_OPT_TYPE_HAS_CHILD) { + const struct m_option *ol = arg->p; + int i; + co->slots = NULL; + for (i = 0; ol[i].name != NULL; i++) + m_config_add_option(config, &ol[i], co->name); + } else { + struct m_config_option *i; + // Check if there is already an option pointing to this address + if (arg->p || arg->new && arg->offset >= 0) { + for (i = config->opts; i; i = i->next) { + if (arg->new ? (i->opt->new && i->opt->offset == arg->offset) + : (!i->opt->new && i->opt->p == arg->p)) { + // So we don't save the same vars more than 1 time + co->slots = i->slots; + co->flags |= M_CFG_OPT_ALIAS; + break; + } + } + } + if (!(co->flags & M_CFG_OPT_ALIAS)) { + // Allocate a slot for the defaults + sl = talloc_zero_size(co, sizeof(struct m_config_save_slot) + + arg->type->size); + m_option_save(config, arg, sl->data); + // Hack to avoid too much trouble with dynamically allocated data: + // We replace original default and always use a dynamic version + if ((arg->type->flags & M_OPT_TYPE_DYNAMIC)) { + char **hackptr = m_option_get_ptr(arg, config->optstruct); + if (hackptr && *hackptr) { + *hackptr = NULL; + m_option_set(config, arg, sl->data); + } } + sl->lvl = 0; + sl->prev = NULL; + co->slots = talloc_zero_size(co, sizeof(struct m_config_save_slot) + + arg->type->size); + co->slots->prev = sl; + co->slots->lvl = config->lvl; + m_option_copy(co->opt, co->slots->data, sl->data); } - sl->lvl = 0; - sl->prev = NULL; - co->slots = talloc_zero_size(co, sizeof(m_config_save_slot_t) + - arg->type->size); - co->slots->prev = sl; - co->slots->lvl = config->lvl; - m_option_copy(co->opt, co->slots->data, sl->data); } - } - co->next = config->opts; - config->opts = co; + co->next = config->opts; + config->opts = co; } -int -m_config_register_options(m_config_t *config, const m_option_t *args) { - int i; +int m_config_register_options(struct m_config *config, + const struct m_option *args) +{ + int i; -#ifdef MP_DEBUG - assert(config != NULL); - assert(config->lvl > 0); - assert(args != NULL); -#endif + assert(config != NULL); + assert(config->lvl > 0); + assert(args != NULL); - for(i = 0 ; args[i].name != NULL ; i++) - m_config_add_option(config,&args[i],NULL); + for (i = 0; args[i].name != NULL; i++) + m_config_add_option(config, &args[i], NULL); - return 1; + return 1; } -static m_config_option_t* -m_config_get_co(const m_config_t *config, char *arg) { - m_config_option_t *co; - - for(co = config->opts ; co ; co = co->next ) { - int l = strlen(co->name) - 1; - if((co->opt->type->flags & M_OPT_TYPE_ALLOW_WILDCARD) && - (co->name[l] == '*')) { - if(strncasecmp(co->name,arg,l) == 0) - return co; - } else if(strcasecmp(co->name,arg) == 0) - return co; - } - return NULL; +static struct m_config_option *m_config_get_co(const struct m_config *config, + char *arg) +{ + struct m_config_option *co; + + for (co = config->opts; co; co = co->next) { + int l = strlen(co->name) - 1; + if ((co->opt->type->flags & M_OPT_TYPE_ALLOW_WILDCARD) && + (co->name[l] == '*')) { + if (strncasecmp(co->name, arg, l) == 0) + return co; + } else if (strcasecmp(co->name, arg) == 0) + return co; + } + return NULL; } -static int -m_config_parse_option(const m_config_t *config, char *arg, char *param, int set) { - m_config_option_t *co; - int r = 0; - -#ifdef MP_DEBUG - assert(config != NULL); - assert(config->lvl > 0); - assert(arg != NULL); -#endif - - co = m_config_get_co(config,arg); - if(!co){ -// mp_msg(MSGT_CFGPARSER, MSGL_ERR,"Unknown option: %s\n",arg); - return M_OPT_UNKNOWN; - } - -#ifdef MP_DEBUG - // This is the only mandatory function - assert(co->opt->type->parse); -#endif - - // Check if this option isn't forbidden in the current mode - if((config->mode == M_CONFIG_FILE) && (co->opt->flags & M_OPT_NOCFG)) { - mp_tmsg(MSGT_CFGPARSER, MSGL_ERR,"The %s option can't be used in a config file.\n",arg); - return M_OPT_INVALID; - } - if((config->mode == M_COMMAND_LINE) && (co->opt->flags & M_OPT_NOCMD)) { - mp_tmsg(MSGT_CFGPARSER, MSGL_ERR,"The %s option can't be used on the command line.\n",arg); - return M_OPT_INVALID; - } - // During command line preparse set only pre-parse options - // Otherwise only set pre-parse option if they were not already set. - if(((config->mode == M_COMMAND_LINE_PRE_PARSE) && - !(co->opt->flags & M_OPT_PRE_PARSE)) || - ((config->mode != M_COMMAND_LINE_PRE_PARSE) && - (co->opt->flags & M_OPT_PRE_PARSE) && (co->flags & M_CFG_OPT_SET))) - set = 0; - - // Option with children are a bit different to parse - if(co->opt->type->flags & M_OPT_TYPE_HAS_CHILD) { - char** lst = NULL; - int i,sr; - // Parse the child options - r = m_option_parse(co->opt,arg,param,&lst,M_COMMAND_LINE); - // Set them now - if(r >= 0) - for(i = 0 ; lst && lst[2*i] ; i++) { - int l = strlen(co->name) + 1 + strlen(lst[2*i]) + 1; - if(r >= 0) { - // Build the full name - char n[l]; - sprintf(n,"%s:%s",co->name,lst[2*i]); - sr = m_config_parse_option(config,n,lst[2*i+1],set); - if(sr < 0){ - if(sr == M_OPT_UNKNOWN){ - mp_tmsg(MSGT_CFGPARSER, MSGL_ERR,"Error: option '%s' has no suboption '%s'.\n",co->name,lst[2*i]); - r = M_OPT_INVALID; - } else - if(sr == M_OPT_MISSING_PARAM){ - mp_tmsg(MSGT_CFGPARSER, MSGL_ERR,"Error: suboption '%s' of '%s' must have a parameter!\n",lst[2*i],co->name); - r = M_OPT_INVALID; - } else - r = sr; - } - } - free(lst[2*i]); - free(lst[2*i+1]); +static int m_config_parse_option(const struct m_config *config, char *arg, + char *param, int set) +{ + struct m_config_option *co; + int r = 0; + + assert(config != NULL); + assert(config->lvl > 0); + assert(arg != NULL); + + co = m_config_get_co(config, arg); + if (!co) { + return M_OPT_UNKNOWN; } - free(lst); - } else - r = m_option_parse(co->opt,arg,param,set ? co->slots->data : NULL,config->mode); - // Parsing failed ? - if(r < 0) - return r; - // Set the option - if(set) { - m_option_set(config, co->opt, co->slots->data); - co->flags |= M_CFG_OPT_SET; - } + // This is the only mandatory function + assert(co->opt->type->parse); + + // Check if this option isn't forbidden in the current mode + if ((config->mode == M_CONFIG_FILE) && (co->opt->flags & M_OPT_NOCFG)) { + mp_tmsg(MSGT_CFGPARSER, MSGL_ERR, + "The %s option can't be used in a config file.\n", arg); + return M_OPT_INVALID; + } + if ((config->mode == M_COMMAND_LINE) && (co->opt->flags & M_OPT_NOCMD)) { + mp_tmsg(MSGT_CFGPARSER, MSGL_ERR, + "The %s option can't be used on the command line.\n", arg); + return M_OPT_INVALID; + } + // During command line preparse set only pre-parse options + // Otherwise only set pre-parse option if they were not already set. + if (((config->mode == M_COMMAND_LINE_PRE_PARSE) && + !(co->opt->flags & M_OPT_PRE_PARSE)) || + ((config->mode != M_COMMAND_LINE_PRE_PARSE) && + (co->opt->flags & M_OPT_PRE_PARSE) && (co->flags & M_CFG_OPT_SET))) + set = 0; + + // Option with children are a bit different to parse + if (co->opt->type->flags & M_OPT_TYPE_HAS_CHILD) { + char **lst = NULL; + int i, sr; + // Parse the child options + r = m_option_parse(co->opt, arg, param, &lst, M_COMMAND_LINE); + // Set them now + if (r >= 0) + for (i = 0; lst && lst[2 * i]; i++) { + int l = strlen(co->name) + 1 + strlen(lst[2 * i]) + 1; + if (r >= 0) { + // Build the full name + char n[l]; + sprintf(n, "%s:%s", co->name, lst[2 * i]); + sr = m_config_parse_option(config, n, lst[2 * i + 1], set); + if (sr < 0) { + if (sr == M_OPT_UNKNOWN) { + mp_tmsg(MSGT_CFGPARSER, MSGL_ERR, + "Error: option '%s' has no suboption '%s'.\n", + co->name, lst[2 * i]); + r = M_OPT_INVALID; + } else if (sr == M_OPT_MISSING_PARAM) { + mp_tmsg(MSGT_CFGPARSER, MSGL_ERR, + "Error: suboption '%s' of '%s' must have " + "a parameter!\n", lst[2 * i], co->name); + r = M_OPT_INVALID; + } else + r = sr; + } + } + talloc_free(lst[2 * i]); + talloc_free(lst[2 * i + 1]); + } + talloc_free(lst); + } else + r = m_option_parse(co->opt, arg, param, set ? co->slots->data : NULL, + config->mode); - return r; + // Parsing failed ? + if (r < 0) + return r; + // Set the option + if (set) { + m_option_set(config, co->opt, co->slots->data); + co->flags |= M_CFG_OPT_SET; + } + + return r; } -int -m_config_set_option(m_config_t *config, char* arg, char* param) { - mp_msg(MSGT_CFGPARSER, MSGL_DBG2,"Setting %s=%s\n",arg,param); - return m_config_parse_option(config,arg,param,1); +int m_config_set_option(struct m_config *config, char *arg, char *param) +{ + mp_msg(MSGT_CFGPARSER, MSGL_DBG2, "Setting %s=%s\n", arg, param); + return m_config_parse_option(config, arg, param, 1); } -int -m_config_check_option(const m_config_t *config, char *arg, char *param) { - int r; - mp_msg(MSGT_CFGPARSER, MSGL_DBG2,"Checking %s=%s\n",arg,param); - r=m_config_parse_option(config,arg,param,0); - if(r==M_OPT_MISSING_PARAM){ - mp_tmsg(MSGT_CFGPARSER, MSGL_ERR,"Error: option '%s' must have a parameter!\n",arg); - return M_OPT_INVALID; - } - return r; +int m_config_check_option(const struct m_config *config, char *arg, char *param) +{ + int r; + mp_msg(MSGT_CFGPARSER, MSGL_DBG2, "Checking %s=%s\n", arg, param); + r = m_config_parse_option(config, arg, param, 0); + if (r == M_OPT_MISSING_PARAM) { + mp_tmsg(MSGT_CFGPARSER, MSGL_ERR, + "Error: option '%s' must have a parameter!\n", arg); + return M_OPT_INVALID; + } + return r; } -const m_option_t* -m_config_get_option(const m_config_t *config, char *arg) { - m_config_option_t *co; +const struct m_option *m_config_get_option(const struct m_config *config, + char *arg) +{ + struct m_config_option *co; -#ifdef MP_DEBUG - assert(config != NULL); - assert(config->lvl > 0); - assert(arg != NULL); -#endif + assert(config != NULL); + assert(config->lvl > 0); + assert(arg != NULL); - co = m_config_get_co(config,arg); - if(co) - return co->opt; - else - return NULL; + co = m_config_get_co(config, arg); + if (co) + return co->opt; + else + return NULL; } -void -m_config_print_option_list(const m_config_t *config) { - char min[50],max[50]; - m_config_option_t* co; - int count = 0; +void m_config_print_option_list(const struct m_config *config) +{ + char min[50], max[50]; + struct m_config_option *co; + int count = 0; - if(!config->opts) return; + if (!config->opts) + return; - mp_tmsg(MSGT_CFGPARSER, MSGL_INFO, "\n Name Type Min Max Global CL Cfg\n\n"); - for(co = config->opts ; co ; co = co->next) { - const m_option_t* opt = co->opt; - if(opt->type->flags & M_OPT_TYPE_HAS_CHILD) continue; - if(opt->flags & M_OPT_MIN) - sprintf(min,"%-8.0f",opt->min); - else - strcpy(min,"No"); - if(opt->flags & M_OPT_MAX) - sprintf(max,"%-8.0f",opt->max); - else - strcpy(max,"No"); - mp_msg(MSGT_CFGPARSER, MSGL_INFO, " %-20.20s %-15.15s %-10.10s %-10.10s %-3.3s %-3.3s %-3.3s\n", - co->name, - co->opt->type->name, - min, - max, - opt->flags & CONF_GLOBAL ? "Yes" : "No", - opt->flags & CONF_NOCMD ? "No" : "Yes", - opt->flags & CONF_NOCFG ? "No" : "Yes"); - count++; - } - mp_tmsg(MSGT_CFGPARSER, MSGL_INFO, "\nTotal: %d options\n",count); + mp_tmsg(MSGT_CFGPARSER, MSGL_INFO, + "\n Name Type Min Max Global CL Cfg\n\n"); + for (co = config->opts; co; co = co->next) { + const struct m_option *opt = co->opt; + if (opt->type->flags & M_OPT_TYPE_HAS_CHILD) + continue; + if (opt->flags & M_OPT_MIN) + sprintf(min, "%-8.0f", opt->min); + else + strcpy(min, "No"); + if (opt->flags & M_OPT_MAX) + sprintf(max, "%-8.0f", opt->max); + else + strcpy(max, "No"); + mp_msg(MSGT_CFGPARSER, MSGL_INFO, + " %-20.20s %-15.15s %-10.10s %-10.10s %-3.3s %-3.3s %-3.3s\n", + co->name, + co->opt->type->name, + min, + max, + opt->flags & CONF_GLOBAL ? "Yes" : "No", + opt->flags & CONF_NOCMD ? "No" : "Yes", + opt->flags & CONF_NOCFG ? "No" : "Yes"); + count++; + } + mp_tmsg(MSGT_CFGPARSER, MSGL_INFO, "\nTotal: %d options\n", count); } -m_profile_t* -m_config_get_profile(const m_config_t *config, char *name) { - m_profile_t* p; - for(p = config->profiles ; p ; p = p->next) - if(!strcmp(p->name,name)) return p; - return NULL; +struct m_profile *m_config_get_profile(const struct m_config *config, + char *name) +{ + struct m_profile *p; + for (p = config->profiles; p; p = p->next) + if (!strcmp(p->name, name)) + return p; + return NULL; } -m_profile_t* -m_config_add_profile(m_config_t* config, char* name) { - m_profile_t* p = m_config_get_profile(config,name); - if(p) return p; - p = talloc_zero(config, m_profile_t); - p->name = talloc_strdup(p, name); - p->next = config->profiles; - config->profiles = p; - return p; +struct m_profile *m_config_add_profile(struct m_config *config, char *name) +{ + struct m_profile *p = m_config_get_profile(config, name); + if (p) + return p; + p = talloc_zero(config, struct m_profile); + p->name = talloc_strdup(p, name); + p->next = config->profiles; + config->profiles = p; + return p; } -void -m_profile_set_desc(m_profile_t* p, char* desc) { +void m_profile_set_desc(struct m_profile *p, char *desc) +{ talloc_free(p->desc); p->desc = talloc_strdup(p, desc); } -int -m_config_set_profile_option(m_config_t* config, m_profile_t* p, - char* name, char* val) { - int i = m_config_check_option(config,name,val); - if(i < 0) return i; - p->opts = talloc_realloc(p, p->opts, char *, 2*(p->num_opts+2)); - p->opts[p->num_opts*2] = talloc_strdup(p, name); - p->opts[p->num_opts*2+1] = talloc_strdup(p, val); - p->num_opts++; - p->opts[p->num_opts*2] = p->opts[p->num_opts*2+1] = NULL; - return 1; +int m_config_set_profile_option(struct m_config *config, struct m_profile *p, + char *name, char *val) +{ + int i = m_config_check_option(config, name, val); + if (i < 0) + return i; + p->opts = talloc_realloc(p, p->opts, char *, 2 * (p->num_opts + 2)); + p->opts[p->num_opts * 2] = talloc_strdup(p, name); + p->opts[p->num_opts * 2 + 1] = talloc_strdup(p, val); + p->num_opts++; + p->opts[p->num_opts * 2] = p->opts[p->num_opts * 2 + 1] = NULL; + return 1; } -void -m_config_set_profile(m_config_t* config, m_profile_t* p) { - int i; - if(config->profile_depth > MAX_PROFILE_DEPTH) { - mp_tmsg(MSGT_CFGPARSER, MSGL_WARN, "WARNING: Profile inclusion too deep.\n"); - return; - } - int prev_mode = config->mode; - config->mode = M_CONFIG_FILE; - config->profile_depth++; - for(i = 0 ; i < p->num_opts ; i++) - m_config_set_option(config,p->opts[2*i],p->opts[2*i+1]); - config->profile_depth--; - config->mode = prev_mode; +void m_config_set_profile(struct m_config *config, struct m_profile *p) +{ + int i; + if (config->profile_depth > MAX_PROFILE_DEPTH) { + mp_tmsg(MSGT_CFGPARSER, MSGL_WARN, + "WARNING: Profile inclusion too deep.\n"); + return; + } + int prev_mode = config->mode; + config->mode = M_CONFIG_FILE; + config->profile_depth++; + for (i = 0; i < p->num_opts; i++) + m_config_set_option(config, p->opts[2 * i], p->opts[2 * i + 1]); + config->profile_depth--; + config->mode = prev_mode; } diff --git a/m_config.h b/m_config.h index 9e06ee5715..a884a29a76 100644 --- a/m_config.h +++ b/m_config.h @@ -19,210 +19,173 @@ #ifndef MPLAYER_M_CONFIG_H #define MPLAYER_M_CONFIG_H -/// \defgroup Config Config manager -/// -/// m_config provides an API to manipulate the config variables in MPlayer. -/// It makes use of the \ref Options API to provide a context stack that -/// allows saving and later restoring the state of all variables. -///@{ - -/// \file - -typedef struct m_config_option m_config_option_t; -typedef struct m_config_save_slot m_config_save_slot_t; -/// \ingroup ConfigProfiles +// m_config provides an API to manipulate the config variables in MPlayer. +// It makes use of the Options API to provide a context stack that +// allows saving and later restoring the state of all variables. + typedef struct m_profile m_profile_t; struct m_option; struct m_option_type; -/// Config option save slot +// Config option save slot struct m_config_save_slot { - /// Previous level slot. - m_config_save_slot_t* prev; - /// Level at which the save was made. - int lvl; - // We have to store other datatypes in this as well, - // so make sure we get properly aligned addresses. - unsigned char data[0] __attribute__ ((aligned (8))); + // Previous level slot. + struct m_config_save_slot *prev; + // Level at which the save was made. + int lvl; + // We have to store other datatypes in this as well, + // so make sure we get properly aligned addresses. + unsigned char data[0] __attribute__ ((aligned(8))); }; -/// Config option +// Config option struct m_config_option { - m_config_option_t* next; - /// Full name (ie option:subopt). - char* name; - /// Option description. - const struct m_option* opt; - /// Save slot stack. - m_config_save_slot_t* slots; - /// See \ref ConfigOptionFlags. - unsigned int flags; + struct m_config_option *next; + // Full name (ie option:subopt). + char *name; + // Option description. + const struct m_option *opt; + // Save slot stack. + struct m_config_save_slot *slots; + // See \ref ConfigOptionFlags. + unsigned int flags; }; -/// \defgroup ConfigProfiles Config profiles -/// \ingroup Config -/// -/// Profiles allow to predefine some sets of options that can then -/// be applied later on with the internal -profile option. -/// -///@{ +// Profiles allow to predefine some sets of options that can then +// be applied later on with the internal -profile option. -/// Config profile +// Config profile struct m_profile { - m_profile_t* next; - char* name; - char* desc; - int num_opts; - /// Option/value pair array. - char** opts; + struct m_profile *next; + char *name; + char *desc; + int num_opts; + // Option/value pair array. + char **opts; }; -///@} - -/// Config object +// Config object /** \ingroup Config */ typedef struct m_config { - /// Registered options. - /** This contains all options and suboptions. - */ - m_config_option_t* opts; - /// Current stack level. - int lvl; - /// \ref OptionParserModes - int mode; - /// List of defined profiles. - m_profile_t* profiles; - /// Depth when recursively including profiles. - int profile_depth; - - void *optstruct; // struct mpopts or other + // Registered options. + /** This contains all options and suboptions. + */ + struct m_config_option *opts; + // Current stack level. + int lvl; + // \ref OptionParserModes + int mode; + // List of defined profiles. + struct m_profile *profiles; + // Depth when recursively including profiles. + int profile_depth; + + void *optstruct; // struct mpopts or other } m_config_t; -/// \defgroup ConfigOptionFlags Config option flags -/// \ingroup Config -///@{ -/// Set if an option has been set at the current level. -#define M_CFG_OPT_SET (1<<0) +// Set if an option has been set at the current level. +#define M_CFG_OPT_SET (1 << 0) -/// Set if another option already uses the same variable. -#define M_CFG_OPT_ALIAS (1<<1) +// Set if another option already uses the same variable. +#define M_CFG_OPT_ALIAS (1 << 1) -///@} - -/// Create a new config object. -/** \ingroup Config - */ -m_config_t* +// Create a new config object. +struct m_config * m_config_new(void *optstruct, int includefunc(struct m_option *conf, char *filename)); -/// Free a config object. -void -m_config_free(m_config_t* config); +// Free a config object. +void m_config_free(struct m_config *config); -/// Push a new context. -/** \param config The config object. +/* Push a new context. + * \param config The config object. */ -void -m_config_push(m_config_t* config); +void m_config_push(struct m_config *config); -/// Pop the current context restoring the previous context state. -/** \param config The config object. +/* Pop the current context restoring the previous context state. + * \param config The config object. */ -void -m_config_pop(m_config_t* config); +void m_config_pop(struct m_config *config); -/// Register some options to be used. -/** \param config The config object. +/* Register some options to be used. + * \param config The config object. * \param args An array of \ref m_option struct. * \return 1 on success, 0 on failure. */ -int -m_config_register_options(m_config_t *config, const struct m_option *args); +int m_config_register_options(struct m_config *config, + const struct m_option *args); -/// Set an option. -/** \param config The config object. +/* Set an option. + * \param config The config object. * \param arg The option's name. * \param param The value of the option, can be NULL. * \return See \ref OptionParserReturn. */ -int -m_config_set_option(m_config_t *config, char* arg, char* param); +int m_config_set_option(struct m_config *config, char *arg, char *param); -/// Check if an option setting is valid. -/** \param config The config object. +/* Check if an option setting is valid. + * \param config The config object. * \param arg The option's name. * \param param The value of the option, can be NULL. * \return See \ref OptionParserReturn. */ -int -m_config_check_option(const m_config_t *config, char *arg, char *param); +int m_config_check_option(const struct m_config *config, char *arg, + char *param); -/// Get the option matching the given name. -/** \param config The config object. +/* Get the option matching the given name. + * \param config The config object. * \param arg The option's name. */ -const struct m_option* -m_config_get_option(const m_config_t *config, char *arg); +const struct m_option *m_config_get_option(const struct m_config *config, + char *arg); -/// Print a list of all registered options. -/** \param config The config object. +/* Print a list of all registered options. + * \param config The config object. */ -void -m_config_print_option_list(const m_config_t *config); +void m_config_print_option_list(const struct m_config *config); -/// \addtogroup ConfigProfiles -///@{ -/// Find the profile with the given name. -/** \param config The config object. +/* Find the profile with the given name. + * \param config The config object. * \param arg The profile's name. * \return The profile object or NULL. */ -m_profile_t* -m_config_get_profile(const m_config_t *config, char *name); +struct m_profile *m_config_get_profile(const struct m_config *config, + char *name); -/// Get the profile with the given name, creating it if necessary. -/** \param config The config object. +/* Get the profile with the given name, creating it if necessary. + * \param config The config object. * \param arg The profile's name. * \return The profile object. */ -m_profile_t* -m_config_add_profile(m_config_t* config, char* name); +struct m_profile *m_config_add_profile(struct m_config *config, char *name); -/// Set the description of a profile. -/** Used by the config file parser when defining a profile. +/* Set the description of a profile. + * Used by the config file parser when defining a profile. * * \param p The profile object. * \param arg The profile's name. */ -void -m_profile_set_desc(m_profile_t* p, char* desc); +void m_profile_set_desc(struct m_profile *p, char *desc); -/// Add an option to a profile. -/** Used by the config file parser when defining a profile. +/* Add an option to a profile. + * Used by the config file parser when defining a profile. * * \param config The config object. * \param p The profile object. * \param name The option's name. * \param val The option's value. */ -int -m_config_set_profile_option(m_config_t* config, m_profile_t* p, - char* name, char* val); +int m_config_set_profile_option(struct m_config *config, struct m_profile *p, + char *name, char *val); -/// Enables profile usage -/** Used by the config file parser when loading a profile. +/* Enables profile usage + * Used by the config file parser when loading a profile. * * \param config The config object. * \param p The profile object. */ -void -m_config_set_profile(m_config_t* config, m_profile_t* p); - -///@} - -///@} +void m_config_set_profile(struct m_config *config, struct m_profile *p); #endif /* MPLAYER_M_CONFIG_H */ diff --git a/m_option.c b/m_option.c index 18fe2f7bdb..17d039f23b 100644 --- a/m_option.c +++ b/m_option.c @@ -35,11 +35,6 @@ #include "stream/url.h" #include "libavutil/avstring.h" -// Don't free for 'production' atm -#ifndef MP_DEBUG -//#define NO_FREE -#endif - const m_option_t *m_option_list_find(const m_option_t *list, const char *name) { int i; @@ -500,8 +495,8 @@ static int parse_str(const m_option_t *opt, const char *name, } if (dst) { - free(VAL(dst)); - VAL(dst) = strdup(param); + talloc_free(VAL(dst)); + VAL(dst) = talloc_strdup(NULL, param); } return 1; @@ -516,19 +511,15 @@ static char *print_str(const m_option_t *opt, const void *val) static void copy_str(const m_option_t *opt, void *dst, const void *src) { if (dst && src) { -#ifndef NO_FREE - free(VAL(dst)); //FIXME!!! -#endif - VAL(dst) = VAL(src) ? strdup(VAL(src)) : NULL; + talloc_free(VAL(dst)); + VAL(dst) = talloc_strdup(NULL, VAL(src)); } } static void free_str(void *src) { if (src && VAL(src)) { -#ifndef NO_FREE - free(VAL(src)); //FIXME!!! -#endif + talloc_free(VAL(src)); VAL(src) = NULL; } } @@ -566,12 +557,9 @@ static void free_str_list(void *dst) return; d = VAL(dst); -// FIXME!!! -#ifndef NO_FREE for (i = 0; d[i] != NULL; i++) - free(d[i]); - free(d); -#endif + talloc_free(d[i]); + talloc_free(d); VAL(dst) = NULL; } @@ -587,7 +575,7 @@ static int str_list_add(char **add, int n, void *dst, int pre) for (ln = 0; lst && lst[ln]; ln++) /**/; - lst = realloc(lst, (n + ln + 1) * sizeof(char *)); + lst = talloc_realloc(NULL, lst, char *, n + ln + 1); if (pre) { memmove(&lst[n], lst, ln * sizeof(char *)); @@ -597,7 +585,7 @@ static int str_list_add(char **add, int n, void *dst, int pre) // (re-)add NULL-termination lst[ln + n] = NULL; - free(add); + talloc_free(add); VAL(dst) = lst; @@ -606,7 +594,7 @@ static int str_list_add(char **add, int n, void *dst, int pre) static int str_list_del(char **del, int n, void *dst) { - char **lst, *ep, **d; + char **lst, *ep; int i, ln, s; long idx; @@ -622,39 +610,36 @@ static int str_list_del(char **del, int n, void *dst) idx = strtol(del[i], &ep, 0); if (*ep) { mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Invalid index: %s\n", del[i]); - free(del[i]); + talloc_free(del[i]); continue; } - free(del[i]); + talloc_free(del[i]); if (idx < 0 || idx >= ln) { mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Index %ld is out of range.\n", idx); continue; } else if (!lst[idx]) continue; - free(lst[idx]); + talloc_free(lst[idx]); lst[idx] = NULL; s--; } - free(del); + talloc_free(del); if (s == 0) { - free(lst); + talloc_free(lst); VAL(dst) = NULL; return 1; } - d = calloc(s + 1, sizeof(char *)); + // Don't bother shrinking the list allocation for (i = 0, n = 0; i < ln; i++) { if (!lst[i]) continue; - d[n] = lst[i]; + lst[n] = lst[i]; n++; } - d[s] = NULL; - - free(lst); - VAL(dst) = d; + lst[s] = NULL; return 1; } @@ -729,28 +714,25 @@ static int parse_str_list(const m_option_t *opt, const char *name, if (!dst) return 1; - res = malloc((n + 2) * sizeof(char *)); - ptr = str = strdup(param); + res = talloc_array(NULL, char *, n + 2); + ptr = str = talloc_strdup(NULL, param); n = 0; while (1) { last_ptr = ptr; ptr = get_nextsep(ptr, separator, 1); if (!ptr) { - res[n] = strdup(last_ptr); + res[n] = talloc_strdup(NULL, last_ptr); n++; break; } len = ptr - last_ptr; - res[n] = malloc(len + 1); - if (len) - strncpy(res[n], last_ptr, len); - res[n][len] = '\0'; + res[n] = talloc_strndup(NULL, last_ptr, len); ptr++; n++; } res[n] = NULL; - free(str); + talloc_free(str); switch (op) { case OP_ADD: @@ -787,9 +769,9 @@ static void copy_str_list(const m_option_t *opt, void *dst, const void *src) for (n = 0; s[n] != NULL; n++) /* NOTHING */; - d = malloc((n + 1) * sizeof(char *)); + d = talloc_array(NULL, char *, n + 1); for (; n >= 0; n--) - d[n] = s[n] ? strdup(s[n]) : NULL; + d[n] = talloc_strdup(NULL, s[n]); VAL(dst) = d; } @@ -834,19 +816,18 @@ const m_option_type_t m_option_type_string_list = { /////////////////// Func based options // A chained list to save the various calls for func_param -typedef struct m_func_save m_func_save_t; struct m_func_save { - m_func_save_t *next; + struct m_func_save *next; char *name; char *param; }; #undef VAL -#define VAL(x) (*(m_func_save_t **)(x)) +#define VAL(x) (*(struct m_func_save **)(x)) static void free_func_pf(void *src) { - m_func_save_t *s, *n; + struct m_func_save *s, *n; if (!src) return; @@ -855,9 +836,9 @@ static void free_func_pf(void *src) while (s) { n = s->next; - free(s->name); - free(s->param); - free(s); + talloc_free(s->name); + talloc_free(s->param); + talloc_free(s); s = n; } VAL(src) = NULL; @@ -867,14 +848,14 @@ static void free_func_pf(void *src) static int parse_func_pf(const m_option_t *opt, const char *name, const char *param, void *dst, int src) { - m_func_save_t *s, *p; + struct m_func_save *s, *p; if (!dst) return 1; - s = calloc(1, sizeof(m_func_save_t)); - s->name = strdup(name); - s->param = param ? strdup(param) : NULL; + s = talloc_zero(NULL, struct m_func_save); + s->name = talloc_strdup(NULL, name); + s->param = talloc_strdup(NULL, param); p = VAL(dst); if (p) { @@ -889,7 +870,7 @@ static int parse_func_pf(const m_option_t *opt, const char *name, static void copy_func_pf(const m_option_t *opt, void *dst, const void *src) { - m_func_save_t *d = NULL, *s, *last = NULL; + struct m_func_save *d = NULL, *s, *last = NULL; if (!(dst && src)) return; @@ -899,9 +880,9 @@ static void copy_func_pf(const m_option_t *opt, void *dst, const void *src) free_func_pf(dst); while (s) { - d = calloc(1, sizeof(m_func_save_t)); - d->name = strdup(s->name); - d->param = s->param ? strdup(s->param) : NULL; + d = talloc_zero(NULL, struct m_func_save); + d->name = talloc_strdup(NULL, s->name); + d->param = talloc_strdup(NULL, s->param); if (last) last->next = d; else @@ -917,7 +898,7 @@ static void copy_func_pf(const m_option_t *opt, void *dst, const void *src) static void set_func_param(const m_option_t *opt, void *dst, const void *src) { - m_func_save_t *s; + struct m_func_save *s; if (!src) return; @@ -933,7 +914,7 @@ static void set_func_param(const m_option_t *opt, void *dst, const void *src) const m_option_type_t m_option_type_func_param = { "Func param", "", - sizeof(m_func_save_t *), + sizeof(struct m_func_save *), M_OPT_TYPE_INDIRECT, parse_func_pf, NULL, @@ -1045,8 +1026,8 @@ static int parse_subconf(const m_option_t *opt, const char *name, if (param == NULL || strlen(param) == 0) return M_OPT_MISSING_PARAM; - subparam = malloc(strlen(param) + 1); - subopt = malloc(strlen(param) + 1); + subparam = talloc_size(NULL, strlen(param) + 1); + subopt = talloc_size(NULL, strlen(param) + 1); p = param; subopts = opt->p; @@ -1114,9 +1095,10 @@ static int parse_subconf(const m_option_t *opt, const char *name, if (r < 0) return r; if (dst) { - lst = realloc(lst, 2 * (nr + 2) * sizeof(char *)); - lst[2 * nr] = strdup(subopt); - lst[2 * nr + 1] = subparam[0] == 0 ? NULL : strdup(subparam); + lst = talloc_realloc(NULL, lst, char *, 2 * (nr + 2)); + lst[2 * nr] = talloc_strdup(NULL, subopt); + lst[2 * nr + 1] = subparam[0] == 0 ? NULL : + talloc_strdup(NULL, subparam); memset(&lst[2 * (nr + 1)], 0, 2 * sizeof(char *)); nr++; } @@ -1124,8 +1106,8 @@ static int parse_subconf(const m_option_t *opt, const char *name, } } - free(subparam); - free(subopt); + talloc_free(subparam); + talloc_free(subopt); if (dst) VAL(dst) = lst; @@ -1541,8 +1523,8 @@ static int get_obj_param(const char *opt_name, const char *obj_name, return r; } if (dst) { - dst[0] = strdup(str); - dst[1] = p ? strdup(p) : NULL; + dst[0] = talloc_strdup(NULL, str); + dst[1] = talloc_strdup(NULL, p); } eq[0] = '='; } else { @@ -1561,8 +1543,8 @@ static int get_obj_param(const char *opt_name, const char *obj_name, return r; } if (dst) { - dst[0] = strdup(opt->name); - dst[1] = strdup(str); + dst[0] = talloc_strdup(NULL, opt->name); + dst[1] = talloc_strdup(NULL, str); } (*nold)++; } @@ -1644,7 +1626,7 @@ static int get_obj_params(const char *opt_name, const char *name, char *params, if (n == 0) // No options or only empty options return 1; - ret = malloc((n + 2) * 2 * sizeof(char *)); + ret = talloc_array(NULL, char *, (n + 2) * 2); n = nold = 0; last_ptr = params; @@ -1687,10 +1669,10 @@ static int parse_obj_params(const m_option_t *opt, const char *name, return M_OPT_INVALID; desc = p->desc; - cpy = strdup(param); + cpy = talloc_strdup(NULL, param); r = get_obj_params(name, desc->name, cpy, desc, p->separator, dst ? &opts : NULL); - free(cpy); + talloc_free(cpy); if (r < 0) return r; if (!dst) @@ -1773,9 +1755,9 @@ static int parse_obj_settings(const char *opt, char *str, "Option %s: %s have no option description.\n", opt, str); return M_OPT_EXIT - 1; } - plist = calloc(4, sizeof(char *)); - plist[0] = strdup("_oldargs_"); - plist[1] = strdup(param); + plist = talloc_zero_array(NULL, char *, 4); + plist[0] = talloc_strdup(NULL, "_oldargs_"); + plist[1] = talloc_strdup(NULL, param); } else if (desc) { r = get_obj_params(opt, str, param, desc, ':', _ret ? &plist : NULL); @@ -1786,9 +1768,9 @@ static int parse_obj_settings(const char *opt, char *str, if (!_ret) return 1; - ret = realloc(ret, (ret_n + 2) * sizeof(m_obj_settings_t)); + ret = talloc_realloc(NULL, ret, struct m_obj_settings, ret_n + 2); memset(&ret[ret_n], 0, 2 * sizeof(m_obj_settings_t)); - ret[ret_n].name = strdup(str); + ret[ret_n].name = talloc_strdup(NULL, str); ret[ret_n].attribs = plist; *_ret = ret; @@ -1838,7 +1820,7 @@ static int obj_settings_list_del(const char *opt_name, const char *param, } if (id < 0) id = idx_max + id; - free(obj_list[id].name); + talloc_free(obj_list[id].name); free_str_list(&(obj_list[id].attribs)); obj_list[id].name = rem_id; } @@ -1855,7 +1837,8 @@ static int obj_settings_list_del(const char *opt_name, const char *param, idx_max--; } } - obj_list = realloc(obj_list, sizeof(m_obj_settings_t) * (idx_max + 1)); + obj_list = talloc_realloc(NULL, obj_list, struct m_obj_settings, + idx_max + 1); VAL(dst) = obj_list; return 1; @@ -1870,13 +1853,11 @@ static void free_obj_settings_list(void *dst) return; d = VAL(dst); -#ifndef NO_FREE for (n = 0; d[n].name; n++) { - free(d[n].name); + talloc_free(d[n].name); free_str_list(&(d[n].attribs)); } - free(d); -#endif + talloc_free(d); VAL(dst) = NULL; } @@ -1965,7 +1946,7 @@ static int parse_obj_settings_list(const m_option_t *opt, const char *name, mp_msg(MSGT_VFILTER, MSGL_INFO, "\n"); return M_OPT_EXIT - 1; } - ptr = str = strdup(param); + ptr = str = talloc_strdup(NULL, param); while (ptr[0] != '\0') { last_ptr = ptr; @@ -1975,7 +1956,7 @@ static int parse_obj_settings_list(const m_option_t *opt, const char *name, r = parse_obj_settings(name, last_ptr, opt->priv, dst ? &res : NULL, n); if (r < 0) { - free(str); + talloc_free(str); return r; } n++; @@ -1984,13 +1965,13 @@ static int parse_obj_settings_list(const m_option_t *opt, const char *name, ptr[0] = '\0'; r = parse_obj_settings(name, last_ptr, opt->priv, dst ? &res : NULL, n); if (r < 0) { - free(str); + talloc_free(str); return r; } ptr++; n++; } - free(str); + talloc_free(str); if (n == 0) return M_OPT_INVALID; @@ -2003,18 +1984,20 @@ static int parse_obj_settings_list(const m_option_t *opt, const char *name, int qsize; for (qsize = 0; queue[qsize].name; qsize++) /* NOP */; - res = realloc(res, (qsize + n + 1) * sizeof(m_obj_settings_t)); + res = talloc_realloc(NULL, res, struct m_obj_settings, + qsize + n + 1); memcpy(&res[n], queue, (qsize + 1) * sizeof(m_obj_settings_t)); n += qsize; - free(queue); + talloc_free(queue); } if (head) { int hsize; for (hsize = 0; head[hsize].name; hsize++) /* NOP */; - head = realloc(head, (hsize + n + 1) * sizeof(m_obj_settings_t)); + head = talloc_realloc(NULL, head, struct m_obj_settings, + hsize + n + 1); memcpy(&head[hsize], res, (n + 1) * sizeof(m_obj_settings_t)); - free(res); + talloc_free(res); res = head; } VAL(dst) = res; @@ -2042,9 +2025,9 @@ static void copy_obj_settings_list(const m_option_t *opt, void *dst, for (n = 0; s[n].name; n++) /* NOP */; - d = malloc((n + 1) * sizeof(m_obj_settings_t)); + d = talloc_array(NULL, struct m_obj_settings, n + 1); for (n = 0; s[n].name; n++) { - d[n].name = strdup(s[n].name); + d[n].name = talloc_strdup(NULL, s[n].name); d[n].attribs = NULL; copy_str_list(NULL, &(d[n].attribs), &(s[n].attribs)); } @@ -2350,12 +2333,12 @@ static int parse_custom_url(const m_option_t *opt, const char *name, int l = strlen(ptr2 + 1) + 1; char *fname = ptr2 + 1; if (l > 1) { - fname = malloc(l); + fname = talloc_size(NULL, l); url_unescape_string(fname, ptr2 + 1); } r = m_struct_set(desc, dst, "filename", fname); if (fname != ptr2 + 1) - free(fname); + talloc_free(fname); if (r < 0) { mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option %s: Error while setting filename.\n", @@ -3913,9 +3913,6 @@ int i; set_priority(); #endif - if (codec_path) - set_codec_path(codec_path); - if(opts->video_driver_list && strcmp(opts->video_driver_list[0],"help")==0){ list_video_out(); opt_exit = 1; @@ -181,22 +181,6 @@ void set_path_env(void) char *codec_path = BINARY_CODECS_PATH; -static int needs_free = 0; - -void set_codec_path(const char *path) -{ - if (needs_free) - free(codec_path); - if (path == 0) { - codec_path = BINARY_CODECS_PATH; - needs_free = 0; - return; - } - codec_path = malloc(strlen(path) + 1); - strcpy(codec_path, path); - needs_free = 1; -} - char *mp_basename(const char *path) { char *s; |