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/setup.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/setup.c') diff --git a/src/setup.c b/src/setup.c index dfeb4df..fe5803a 100644 --- a/src/setup.c +++ b/src/setup.c @@ -132,7 +132,7 @@ int setup_interactively(til_settings_t *settings, int (*setup_func)(const til_se if (*buf == '\n') { /* accept preferred */ - til_settings_add_value(desc->container, desc->spec.key, desc->spec.preferred, NULL); + til_settings_add_value(desc->container, desc->spec.key, desc->spec.preferred); } else { buf[strlen(buf) - 1] = '\0'; @@ -148,7 +148,7 @@ int setup_interactively(til_settings_t *settings, int (*setup_func)(const til_se for (found = i = 0; desc->spec.values[i]; i++) { if (i == j) { - til_settings_add_value(desc->container, desc->spec.key, desc->spec.values[i], NULL); + til_settings_add_value(desc->container, desc->spec.key, desc->spec.values[i]); found = 1; break; } @@ -163,7 +163,7 @@ int setup_interactively(til_settings_t *settings, int (*setup_func)(const til_se } else { /* use typed input as setting, TODO: apply regex */ - til_settings_add_value(desc->container, desc->spec.key, buf, NULL); + til_settings_add_value(desc->container, desc->spec.key, buf); } } _next: -- cgit v1.2.1