diff options
| author | Vito Caputo <vcaputo@pengaru.com> | 2023-08-30 21:06:21 -0700 |
|---|---|---|
| committer | Vito Caputo <vcaputo@pengaru.com> | 2023-08-30 21:45:13 -0700 |
| commit | ec4a31c793875e9f9292688581b1deb601e2104b (patch) | |
| tree | 3f60e1e229736cdd55942890d2982219cc10fd99 /src/modules/roto | |
| parent | 0a024f3565723551000243abfc34861d10a162a0 (diff) | |
modules/roto: handle baking errors in roto_setup()
More setup_func conversion to returning the failed setting on
errors during res_setup baking.
Diffstat (limited to 'src/modules/roto')
| -rw-r--r-- | src/modules/roto/roto.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/modules/roto/roto.c b/src/modules/roto/roto.c index fe225e7..a0fb680 100644 --- a/src/modules/roto/roto.c +++ b/src/modules/roto/roto.c @@ -449,7 +449,7 @@ til_module_t roto_module = { static int roto_setup(const til_settings_t *settings, til_setting_t **res_setting, const til_setting_desc_t **res_desc, til_setup_t **res_setup) { - const char *fill_module; + til_setting_t *fill_module; const til_settings_t *fill_module_settings; const char *fill_module_values[] = { "none", @@ -466,7 +466,7 @@ static int roto_setup(const til_settings_t *settings, til_setting_t **res_settin }; int r; - r = til_settings_get_and_describe_value(settings, + r = til_settings_get_and_describe_setting(settings, &(til_setting_spec_t){ .name = "Filled module (\"none\" for classic roto)", .key = "fill_module", @@ -481,10 +481,8 @@ static int roto_setup(const til_settings_t *settings, til_setting_t **res_settin if (r) return r; - assert(res_setting && *res_setting); - assert((*res_setting)->value_as_nested_settings); - - fill_module_settings = (*res_setting)->value_as_nested_settings; + fill_module_settings = fill_module->value_as_nested_settings; + assert(fill_module_settings); r = roto_fill_module_setup(fill_module_settings, res_setting, |