From b097d76281151ca6013f84e3585c038b9c04fb82 Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 24 Feb 2014 20:03:45 +0100 Subject: m_property: simplify some code --- options/m_property.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'options/m_property.c') diff --git a/options/m_property.c b/options/m_property.c index 225296db89..9ac5ab43bd 100644 --- a/options/m_property.c +++ b/options/m_property.c @@ -183,16 +183,12 @@ int m_property_do(struct mp_log *log, const m_option_t *prop_list, case M_PROPERTY_SET: { if (!log) return M_PROPERTY_ERROR; - if (!opt.type->clamp) { - mp_warn(log, "Property '%s' without clamp().\n", name); - } else { - m_option_copy(&opt, &val, arg); - r = opt.type->clamp(&opt, arg); - m_option_free(&opt, &val); - if (r != 0) { - mp_err(log, "Property '%s': invalid value.\n", name); - return M_PROPERTY_ERROR; - } + m_option_copy(&opt, &val, arg); + r = opt.type->clamp ? opt.type->clamp(&opt, arg) : 0; + m_option_free(&opt, &val); + if (r != 0) { + mp_err(log, "Property '%s': invalid value.\n", name); + return M_PROPERTY_ERROR; } return do_action(prop_list, name, M_PROPERTY_SET, arg, ctx); } -- cgit v1.2.3