debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-12-23 01:44:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

moved _config_(get|set)_list () functions earlier in the file

Browse source 
Moved static functions _config_get_list () and _config_set_list ()
closer to the beginning of file so that their definition is known
(without adding forward declarations) in upcoming changes.
This commit is contained in:
Tomi Ollila 2012-01-30 12:31:25 +02:00 committed by David Bremner
parent 6f388fa711
commit fe74e6bea3
1 changed files with 42 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
notmuch-config.c
View file

@ -467,6 +467,48 @@ notmuch_config_save (notmuch_config_t *config)
return 0; return 0;
} }
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)
{
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);
}
}
if (ret_length)
*ret_length = *list_length;
return *outlist;
}
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;
}
const char * const char *
notmuch_config_get_database_path (notmuch_config_t *config) notmuch_config_get_database_path (notmuch_config_t *config)
{ {
@ -551,37 +593,6 @@ notmuch_config_set_user_primary_email (notmuch_config_t *config,
config->user_primary_email = NULL; config->user_primary_email = NULL;
} }
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)
{
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);
}
}
if (ret_length)
*ret_length = *list_length;
return *outlist;
}
const char ** const char **
notmuch_config_get_user_other_email (notmuch_config_t *config, size_t *length) notmuch_config_get_user_other_email (notmuch_config_t *config, size_t *length)
{ {
@ -598,17 +609,6 @@ notmuch_config_get_new_tags (notmuch_config_t *config, size_t *length)
&(config->new_tags_length), length); &(config->new_tags_length), length);
} }
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 void
notmuch_config_set_user_other_email (notmuch_config_t *config, notmuch_config_set_user_other_email (notmuch_config_t *config,
const char *list[], const char *list[],