From 126f38df518b4a26886b69a418d748af4f759dcd Mon Sep 17 00:00:00 2001 From: Vito Caputo Date: Sat, 3 Jun 2023 13:55:41 -0700 Subject: til_settings: drop desc from til_settings_add_value() In a world where "describing" settings is an iterative process, especially post-nested-settings which are realized via the desc-applying process, it's better to not even offer desc-setting while adding a new setting. This commit just gets rid of that. The one caller that was passing a non-NULL desc to til_settings_add_value(), til_module_setup_randomize(), was redundantly doing so since the subsequent desc-processing was assigning it again anyways. Future commits will likely change til_module_setup_randomize() use a non-NULL desc for skipping desc-applying, which wouldn't even work if it was always setting the desc @ add time. That becomes necessary for partially randomizing sparsely-populated settings. --- src/til.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/til.c') diff --git a/src/til.c b/src/til.c index 66f4870..0abcc17 100644 --- a/src/til.c +++ b/src/til.c @@ -395,7 +395,7 @@ int til_module_setup_randomize(const til_module_t *module, unsigned seed, til_se char *value; value = desc->spec.random(rand_r(&seed)); - setting = til_settings_add_value(desc->container, desc->spec.key, value, desc); + setting = til_settings_add_value(desc->container, desc->spec.key, value); free(value); } else if (desc->spec.values) { int n; @@ -404,9 +404,9 @@ int til_module_setup_randomize(const til_module_t *module, unsigned seed, til_se n = rand_r(&seed) % n; - setting = til_settings_add_value(desc->container, desc->spec.key, desc->spec.values[n], desc); + setting = til_settings_add_value(desc->container, desc->spec.key, desc->spec.values[n]); } else { - setting = til_settings_add_value(desc->container, desc->spec.key, desc->spec.preferred, desc); + setting = til_settings_add_value(desc->container, desc->spec.key, desc->spec.preferred); } } -- cgit v1.2.1