summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--m_config.c11
-rw-r--r--m_option.h19
-rw-r--r--m_property.c41
3 files changed, 37 insertions, 34 deletions
diff --git a/m_config.c b/m_config.c
index 56886e08eb..444847f123 100644
--- a/m_config.c
+++ b/m_config.c
@@ -330,15 +330,14 @@ static void m_config_add_option(struct m_config *config,
} else if (arg->type->flags & M_OPT_TYPE_DYNAMIC) {
// Initialize dynamically managed fields from static data (like
// string options): copy the option into temporary memory,
- // clear the original option (to void m_option freeing the
+ // clear the original option (to stop m_option from freeing the
// static data), copy it back.
if (co->data) {
- void *temp = talloc_zero_size(NULL, arg->type->size);
- m_option_copy(arg, temp, co->data);
+ union m_option_value temp = {0};
+ m_option_copy(arg, &temp, co->data);
memset(co->data, 0, arg->type->size);
- m_option_copy(arg, co->data, temp);
- m_option_free(arg, temp);
- talloc_free(temp);
+ m_option_copy(arg, co->data, &temp);
+ m_option_free(arg, &temp);
}
}
}
diff --git a/m_option.h b/m_option.h
index 69694c4286..11e9e620fb 100644
--- a/m_option.h
+++ b/m_option.h
@@ -176,6 +176,25 @@ struct m_sub_options {
#define CONF_TYPE_TIME (&m_option_type_time)
#define CONF_TYPE_TIME_SIZE (&m_option_type_time_size)
+// Possible option values. Code is allowed to access option data without going
+// through this union. It serves for self-documentation and to get minimal
+// size/alignment requirements for option values in general.
+union m_option_value {
+ int flag; // not the C type "bool"!
+ int int_;
+ int64_t int64;
+ float float_;
+ double double_;
+ char *string;
+ char **string_list;
+ int imgfmt;
+ int afmt;
+ m_span_t span;
+ m_obj_settings_t *obj_settings_list;
+ double time;
+ m_time_size_t time_size;
+};
+
////////////////////////////////////////////////////////////////////////////
// Option type description
diff --git a/m_property.c b/m_property.c
index d7ae0c93fc..cb19ff08cb 100644
--- a/m_property.c
+++ b/m_property.c
@@ -67,7 +67,7 @@ int m_property_do(const m_option_t *prop_list, const char *name,
int action, void *arg, void *ctx)
{
const m_option_t *opt;
- void *val;
+ union m_option_value val = {0};
int r;
char *str;
@@ -78,13 +78,10 @@ int m_property_do(const m_option_t *prop_list, const char *name,
if ((r =
do_action(prop_list, name, M_PROPERTY_GET_TYPE, &opt, ctx)) <= 0)
return r;
- val = calloc(1, opt->type->size);
- if ((r = do_action(prop_list, name, M_PROPERTY_GET, val, ctx)) <= 0) {
- free(val);
+ // Fallback to m_option
+ if ((r = do_action(prop_list, name, M_PROPERTY_GET, &val, ctx)) <= 0)
return r;
- }
- str = m_option_pretty_print(opt, val);
- free(val);
+ str = m_option_pretty_print(opt, &val);
*(char **)arg = str;
return str != NULL;
case M_PROPERTY_TO_STRING:
@@ -95,13 +92,9 @@ int m_property_do(const m_option_t *prop_list, const char *name,
if ((r =
do_action(prop_list, name, M_PROPERTY_GET_TYPE, &opt, ctx)) <= 0)
return r;
- val = calloc(1, opt->type->size);
- if ((r = do_action(prop_list, name, M_PROPERTY_GET, val, ctx)) <= 0) {
- free(val);
+ if ((r = do_action(prop_list, name, M_PROPERTY_GET, &val, ctx)) <= 0)
return r;
- }
- str = m_option_print(opt, val);
- free(val);
+ str = m_option_print(opt, &val);
*(char **)arg = str;
return str != NULL;
case M_PROPERTY_PARSE:
@@ -113,14 +106,10 @@ int m_property_do(const m_option_t *prop_list, const char *name,
if ((r =
do_action(prop_list, name, M_PROPERTY_GET_TYPE, &opt, ctx)) <= 0)
return r;
- val = calloc(1, opt->type->size);
- if ((r = m_option_parse(opt, bstr0(opt->name), bstr0(arg), val)) <= 0) {
- free(val);
+ if ((r = m_option_parse(opt, bstr0(opt->name), bstr0(arg), &val)) <= 0)
return r;
- }
- r = do_action(prop_list, name, M_PROPERTY_SET, val, ctx);
- m_option_free(opt, val);
- free(val);
+ r = do_action(prop_list, name, M_PROPERTY_SET, &val, ctx);
+ m_option_free(opt, &val);
return r;
case M_PROPERTY_SWITCH:
if ((r = do_action(prop_list, name, M_PROPERTY_SWITCH, arg, ctx)) !=
@@ -132,17 +121,13 @@ int m_property_do(const m_option_t *prop_list, const char *name,
// Fallback to m_option
if (!opt->type->add)
return M_PROPERTY_NOT_IMPLEMENTED;
- val = calloc(1, opt->type->size);
- if ((r = do_action(prop_list, name, M_PROPERTY_GET, val, ctx)) <= 0) {
- free(val);
+ if ((r = do_action(prop_list, name, M_PROPERTY_GET, &val, ctx)) <= 0)
return r;
- }
bool wrap = opt->type == &m_option_type_choice ||
opt->type == &m_option_type_flag;
- opt->type->add(opt, val, *(double*)arg, wrap);
- r = do_action(prop_list, name, M_PROPERTY_SET, val, ctx);
- m_option_free(opt, val);
- free(val);
+ opt->type->add(opt, &val, *(double*)arg, wrap);
+ r = do_action(prop_list, name, M_PROPERTY_SET, &val, ctx);
+ m_option_free(opt, &val);
return r;
}
return do_action(prop_list, name, action, arg, ctx);