debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-24 20:08:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib: remove "path" from notmuch struct

Browse source 
This removes duplication between the struct element and the
configuration string_map entry. Create a simple wrapper for setting
the database path that makes sure the trailing / is stripped.
This commit is contained in:
David Bremner 2021-02-02 16:43:58 -04:00
parent 1383481d4a
commit 6251e2bb9e
4 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/config.cc
View file

@ -496,5 +496,8 @@ notmuch_config_set (notmuch_database_t *notmuch, notmuch_config_key_t key, const
void void
_notmuch_config_cache (notmuch_database_t *notmuch, notmuch_config_key_t key, const char *val) _notmuch_config_cache (notmuch_database_t *notmuch, notmuch_config_key_t key, const char *val)
{ {
if (notmuch->config == NULL)
notmuch->config = _notmuch_string_map_create (notmuch);
_notmuch_string_map_set (notmuch->config, _notmuch_config_key_to_string (key), val); _notmuch_string_map_set (notmuch->config, _notmuch_config_key_to_string (key), val);
} }

3
lib/database-private.h
View file

@ -189,9 +189,6 @@ operator& (notmuch_field_flag_t a, notmuch_field_flag_t b)
struct _notmuch_database { struct _notmuch_database {
bool exception_reported; bool exception_reported;
/* Path to database parent directory and or/mail root */
char *path;
/* Path to actual database */ /* Path to actual database */
const char *xapian_path; const char *xapian_path;

2
lib/database.cc
View file

@ -752,7 +752,7 @@ notmuch_database_destroy (notmuch_database_t *notmuch)
const char * const char *
notmuch_database_get_path (notmuch_database_t *notmuch) notmuch_database_get_path (notmuch_database_t *notmuch)
{ {
return notmuch->path; return notmuch_config_get (notmuch, NOTMUCH_CONFIG_DATABASE_PATH);
} }
unsigned int unsigned int

14
lib/open.cc
View file

@ -209,6 +209,17 @@ _alloc_notmuch ()
return notmuch; return notmuch;
} }
static void
_set_database_path (notmuch_database_t *notmuch,
const char *database_path)
{
char *path = talloc_strdup (notmuch, database_path);
strip_trailing (path, '/');
_notmuch_config_cache (notmuch, NOTMUCH_CONFIG_DATABASE_PATH, path);
}
notmuch_status_t notmuch_status_t
notmuch_database_open_with_config (const char *database_path, notmuch_database_open_with_config (const char *database_path,
notmuch_database_mode_t mode, notmuch_database_mode_t mode,
@ -238,8 +249,7 @@ notmuch_database_open_with_config (const char *database_path,
&key_file, &database_path, &message))) &key_file, &database_path, &message)))
goto DONE; goto DONE;
notmuch->path = talloc_strdup (notmuch, database_path); _set_database_path (notmuch, database_path);
strip_trailing (notmuch->path, '/');
if (! (notmuch_path = talloc_asprintf (local, "%s/%s", database_path, ".notmuch"))) { if (! (notmuch_path = talloc_asprintf (local, "%s/%s", database_path, ".notmuch"))) {
message = strdup ("Out of memory\n"); message = strdup ("Out of memory\n");