diff options
| author | Vito Caputo <vcaputo@pengaru.com> | 2023-08-30 22:02:13 -0700 |
|---|---|---|
| committer | Vito Caputo <vcaputo@pengaru.com> | 2023-08-30 22:02:13 -0700 |
| commit | 7176f5abda16cfc67cb180070fae414210df286a (patch) | |
| tree | 8469979790f60f796dacf57f8e6a469f3f118d10 | |
| parent | 8e219de4793f426ed28238fe7a945cce98f2f4e9 (diff) | |
modules/montage: switch to til_settings_get_and_describe_setting()
montage_setup() doesn't have any res_setup baking -EINVAL error
paths, but still transition over to enable potentially
deprecating the value-oriented variant.
What error paths it does have during res_setup baking is nested
in the underlying tile's module setup, and that should be
propagating up any -EINVAL failures with the res_setting already
populated.
| -rw-r--r-- | src/modules/montage/montage.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/modules/montage/montage.c b/src/modules/montage/montage.c index 8aa5b85..7bec28a 100644 --- a/src/modules/montage/montage.c +++ b/src/modules/montage/montage.c @@ -240,10 +240,10 @@ static int montage_tile_module_setup(const til_settings_t *settings, til_setting static int montage_setup(const til_settings_t *settings, til_setting_t **res_setting, const til_setting_desc_t **res_desc, til_setup_t **res_setup) { const til_settings_t *tiles_settings; - const char *tiles; + til_setting_t *tiles; int r; - r = til_settings_get_and_describe_value(settings, + r = til_settings_get_and_describe_setting(settings, &(til_setting_spec_t){ .name = "Comma-separated list of modules, in left-to-right order, wraps top-down. (\"all\" for all)", .key = "tiles", @@ -252,14 +252,14 @@ static int montage_setup(const til_settings_t *settings, til_setting_t **res_set .override = montage_tiles_setting_override, .as_nested_settings = 1, }, - &tiles, /* XXX: unused in raw-value form, we want the settings instance */ + &tiles, res_setting, res_desc); if (r) return r; - assert(res_setting && *res_setting && (*res_setting)->value_as_nested_settings); - tiles_settings = (*res_setting)->value_as_nested_settings; + tiles_settings = tiles->value_as_nested_settings; + assert(tiles_settings); { til_setting_t *tile_setting; |