diff options
| author | David Bremner <david@tethera.net> | 2021-10-27 22:34:18 -0300 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2021-12-03 20:50:03 -0400 |
| commit | d467444085d96229172ce29ef8654c3c459b6ce2 (patch) | |
| tree | d8d5bdc02c81cf3700192750b2751a15d8e11dd9 /lib/open.cc | |
| parent | 378415a55762ff0222e3de6a2e20a9823ce1d07e (diff) | |
lib/open: track which parameters are passed
This will be used to fine tune the loading of configuration for
certain special configuration items (initially just "database.path").
Diffstat (limited to 'lib/open.cc')
| -rw-r--r-- | lib/open.cc | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/lib/open.cc b/lib/open.cc index ba32c2f1..a942383b 100644 --- a/lib/open.cc +++ b/lib/open.cc @@ -247,7 +247,7 @@ _choose_database_path (void *ctx, } static notmuch_database_t * -_alloc_notmuch () +_alloc_notmuch (const char *database_path, const char *config_path, const char *profile) { notmuch_database_t *notmuch; @@ -263,6 +263,15 @@ _alloc_notmuch () notmuch->transaction_count = 0; notmuch->transaction_threshold = 0; notmuch->view = 1; + + notmuch->params = NOTMUCH_PARAM_NONE; + if (database_path) + notmuch->params |= NOTMUCH_PARAM_DATABASE; + if (config_path) + notmuch->params |= NOTMUCH_PARAM_CONFIG; + if (profile) + notmuch->params |= NOTMUCH_PARAM_PROFILE; + return notmuch; } @@ -510,7 +519,7 @@ notmuch_database_open_with_config (const char *database_path, _notmuch_init (); - notmuch = _alloc_notmuch (); + notmuch = _alloc_notmuch (database_path, config_path, profile); if (! notmuch) { status = NOTMUCH_STATUS_OUT_OF_MEMORY; goto DONE; @@ -610,7 +619,7 @@ notmuch_database_create_with_config (const char *database_path, _notmuch_init (); - notmuch = _alloc_notmuch (); + notmuch = _alloc_notmuch (database_path, config_path, profile); if (! notmuch) { status = NOTMUCH_STATUS_OUT_OF_MEMORY; goto DONE; @@ -812,7 +821,7 @@ notmuch_database_load_config (const char *database_path, _notmuch_init (); - notmuch = _alloc_notmuch (); + notmuch = _alloc_notmuch (database_path, config_path, profile); if (! notmuch) { status = NOTMUCH_STATUS_OUT_OF_MEMORY; goto DONE; |