From 1df71b5510599bfd111db7398a666a87f3d63ba5 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sat, 10 Dec 2011 12:35:14 -0400 Subject: [PATCH] cli: factor out config handling code to get/set lists. Two new internal routines are created _config_get_list and _config_set_list; the notmuch_config_get_* functions that deal with lists are simply wrappers for these functions. --- notmuch-config.c | 127 ++++++++++++++++++++++------------------------- 1 file changed, 58 insertions(+), 69 deletions(-) diff --git a/notmuch-config.c b/notmuch-config.c index 1a7ed580..d697138a 100644 --- a/notmuch-config.c +++ b/notmuch-config.c @@ -22,6 +22,7 @@ #include #include +#include static const char toplevel_config_comment[] = " .notmuch-config - Configuration file for the notmuch mail system\n" @@ -520,92 +521,80 @@ notmuch_config_set_user_primary_email (notmuch_config_t *config, config->user_primary_email = NULL; } -const char ** -notmuch_config_get_user_other_email (notmuch_config_t *config, - size_t *length) +static const char ** +_config_get_list (notmuch_config_t *config, + const char *section, const char *key, + const char ***outlist, size_t *list_length, size_t *ret_length) { - char **emails; - size_t emails_length; - unsigned int i; - - if (config->user_other_email == NULL) { - emails = g_key_file_get_string_list (config->key_file, - "user", "other_email", - &emails_length, NULL); - if (emails) { - config->user_other_email = talloc_size (config, - sizeof (char *) * - (emails_length + 1)); - for (i = 0; i < emails_length; i++) - config->user_other_email[i] = talloc_strdup (config->user_other_email, - emails[i]); - config->user_other_email[i] = NULL; - - g_strfreev (emails); - - config->user_other_email_length = emails_length; + assert(outlist); + + if (*outlist == NULL) { + + char **inlist = g_key_file_get_string_list (config->key_file, + section, key, list_length, NULL); + if (inlist) { + unsigned int i; + + *outlist = talloc_size (config, sizeof (char *) * (*list_length + 1)); + + for (i = 0; i < *list_length; i++) + (*outlist)[i] = talloc_strdup (*outlist, inlist[i]); + + (*outlist)[i] = NULL; + + g_strfreev (inlist); } } - *length = config->user_other_email_length; - return config->user_other_email; + if (ret_length) + *ret_length = *list_length; + + return *outlist; } -void -notmuch_config_set_user_other_email (notmuch_config_t *config, - const char *other_email[], - size_t length) +const char ** +notmuch_config_get_user_other_email (notmuch_config_t *config, size_t *length) { - g_key_file_set_string_list (config->key_file, - "user", "other_email", - other_email, length); - - talloc_free (config->user_other_email); - config->user_other_email = NULL; + return _config_get_list (config, "user", "other_email", + &(config->user_other_email), + &(config->user_other_email_length), length); } const char ** -notmuch_config_get_new_tags (notmuch_config_t *config, - size_t *length) +notmuch_config_get_new_tags (notmuch_config_t *config, size_t *length) { - char **tags; - size_t tags_length; - unsigned int i; - - if (config->new_tags == NULL) { - tags = g_key_file_get_string_list (config->key_file, - "new", "tags", - &tags_length, NULL); - if (tags) { - config->new_tags = talloc_size (config, - sizeof (char *) * - (tags_length + 1)); - for (i = 0; i < tags_length; i++) - config->new_tags[i] = talloc_strdup (config->new_tags, - tags[i]); - config->new_tags[i] = NULL; - - g_strfreev (tags); - - config->new_tags_length = tags_length; - } - } + return _config_get_list (config, "new", "tags", + &(config->new_tags), + &(config->new_tags_length), length); +} - *length = config->new_tags_length; - return config->new_tags; +static void +_config_set_list (notmuch_config_t *config, + const char *group, const char *name, + const char *list[], + size_t length, const char ***config_var ) +{ + g_key_file_set_string_list (config->key_file, group, name, list, length); + talloc_free (*config_var); + *config_var = NULL; } void -notmuch_config_set_new_tags (notmuch_config_t *config, - const char *new_tags[], - size_t length) +notmuch_config_set_user_other_email (notmuch_config_t *config, + const char *list[], + size_t length) { - g_key_file_set_string_list (config->key_file, - "new", "tags", - new_tags, length); + _config_set_list (config, "user", "other_email", list, length, + &(config->user_other_email)); +} - talloc_free (config->new_tags); - config->new_tags = NULL; +void +notmuch_config_set_new_tags (notmuch_config_t *config, + const char *list[], + size_t length) +{ + _config_set_list (config, "new", "tags", list, length, + &(config->new_tags)); } /* Given a configuration item of the form . return the -- 2.43.0