1 files changed, 17 insertions, 8 deletions

diff --git a/src/til_settings.h b/src/til_settings.h
index 935aa5b..52535fe 100644
--- a/src/til_settings.h
+++ b/src/til_settings.h
@@ -3,6 +3,9 @@
 
 #include <stdio.h>
 
+typedef struct til_setting_t til_setting_t;
+typedef struct til_settings_t til_settings_t;
+
 /* Individual setting description */
 typedef struct til_setting_desc_t {
 	const char	*name;		/* long-form/human name for setting */
@@ -18,21 +21,27 @@ typedef struct til_setting_desc_t {
 typedef struct til_setting_desc_generator_t {
 	const char	*key;		/* key this generator applies to */
 	const char	**value_ptr;	/* where to put the value */
-	int		(*func)(void *setup_context, til_setting_desc_t **res_desc);
+	int		(*func)(void *setup_context, const til_setting_desc_t **res_desc);
 } til_setting_desc_generator_t;
 
-typedef struct til_settings_t til_settings_t;
+/* Encapsulates a single til_settings_t entry */
+struct til_setting_t {
+	const char			*key;
+	const char			*value;
+	const til_setting_desc_t	*desc;
+};
 
 til_settings_t * til_settings_new(const char *settings);
 til_settings_t * til_settings_free(til_settings_t *settings);
-const char * til_settings_get_value(const til_settings_t *settings, const char *key);
-const char * til_settings_get_key(const til_settings_t *settings, unsigned pos);
-int til_settings_add_value(til_settings_t *settings, const char *key, const char *value);
+const char * til_settings_get_value(const til_settings_t *settings, const char *key, const til_setting_t **res_setting);
+const char * til_settings_get_key(const til_settings_t *settings, unsigned pos, const til_setting_t **res_setting);
+int til_settings_add_value(til_settings_t *settings, const char *key, const char *value, const til_setting_desc_t *desc);
+int til_settings_get_and_describe_value(const til_settings_t *settings, const til_setting_desc_t *desc, const char **res_value, const til_setting_t **res_setting, const til_setting_desc_t **res_desc);
 char * til_settings_as_arg(const til_settings_t *settings);
-int til_settings_apply_desc_generators(const til_settings_t *settings, const til_setting_desc_generator_t generators[], unsigned n_generators, void *setup_context, til_setting_desc_t **next_setting);
+int til_settings_apply_desc_generators(const til_settings_t *settings, const til_setting_desc_generator_t generators[], unsigned n_generators, void *setup_context, const til_setting_t **res_setting, const til_setting_desc_t **res_desc);
 
-int til_setting_desc_clone(const til_setting_desc_t *desc, til_setting_desc_t **res_desc);
-til_setting_desc_t * til_setting_desc_free(til_setting_desc_t *desc);
+int til_setting_desc_clone(const til_setting_desc_t *desc, const til_setting_desc_t **res_desc);
+til_setting_desc_t * til_setting_desc_free(const til_setting_desc_t *desc);
 int til_setting_desc_check(const til_setting_desc_t *desc, const char *value);
 
 #ifndef TIL_SETTINGS_STR