From: David Bremner <david@tethera.net>
To: notmuch@notmuchmail.org
Cc: David Bremner <david@tethera.net>
Subject: [PATCH 06/23] lib/open: allocate notmuch_t struct early
Date: Sun, 7 Feb 2021 20:40:52 -0400 [thread overview]
Message-ID: <20210208004109.1192719-7-david@tethera.net> (raw)
In-Reply-To: <20210208004109.1192719-1-david@tethera.net>
This gives more flexibility in restructuring the database opening
code.
---
lib/open.cc | 46 +++++++++++++++++++++++++++++-----------------
1 file changed, 29 insertions(+), 17 deletions(-)
diff --git a/lib/open.cc b/lib/open.cc
index c200bed6..09fec6e4 100644
--- a/lib/open.cc
+++ b/lib/open.cc
@@ -186,6 +186,20 @@ _choose_database_path (const char *config_path,
return NOTMUCH_STATUS_SUCCESS;
}
+notmuch_database_t * _alloc_notmuch() {
+ notmuch_database_t * notmuch;
+ notmuch = talloc_zero (NULL, notmuch_database_t);
+ if (!notmuch)
+ return NULL;
+
+ notmuch->exception_reported = false;
+ notmuch->status_string = NULL;
+ notmuch->writable_xapian_db = NULL;
+ notmuch->atomic_nesting = 0;
+ notmuch->view = 1;
+ return notmuch;
+}
+
notmuch_status_t
notmuch_database_open_with_config (const char *database_path,
notmuch_database_mode_t mode,
@@ -205,9 +219,18 @@ notmuch_database_open_with_config (const char *database_path,
GKeyFile *key_file = NULL;
static int initialized = 0;
+ notmuch = _alloc_notmuch ();
+ if (!notmuch) {
+ status = NOTMUCH_STATUS_OUT_OF_MEMORY;
+ goto DONE;
+ }
+
if ((status = _choose_database_path (config_path, profile, &key_file, &database_path, &message)))
goto DONE;
+ notmuch->path = talloc_strdup (notmuch, database_path);
+ strip_trailing (notmuch->path, '/');
+
if (! (notmuch_path = talloc_asprintf (local, "%s/%s", database_path, ".notmuch"))) {
message = strdup ("Out of memory\n");
status = NOTMUCH_STATUS_OUT_OF_MEMORY;
@@ -222,6 +245,12 @@ notmuch_database_open_with_config (const char *database_path,
goto DONE;
}
+ if (! (notmuch->xapian_path = talloc_asprintf (local, "%s/%s", notmuch_path, "xapian"))) {
+ message = strdup ("Out of memory\n");
+ status = NOTMUCH_STATUS_OUT_OF_MEMORY;
+ goto DONE;
+ }
+
/* Initialize the GLib type system and threads */
#if ! GLIB_CHECK_VERSION (2, 35, 1)
g_type_init ();
@@ -233,23 +262,6 @@ notmuch_database_open_with_config (const char *database_path,
initialized = 1;
}
- notmuch = talloc_zero (NULL, notmuch_database_t);
- notmuch->exception_reported = false;
- notmuch->status_string = NULL;
- notmuch->path = talloc_strdup (notmuch, database_path);
-
- strip_trailing (notmuch->path, '/');
-
- notmuch->writable_xapian_db = NULL;
- notmuch->atomic_nesting = 0;
- notmuch->view = 1;
-
- if (! (notmuch->xapian_path = talloc_asprintf (notmuch, "%s/%s", notmuch_path, "xapian"))) {
- message = strdup ("Out of memory\n");
- status = NOTMUCH_STATUS_OUT_OF_MEMORY;
- goto DONE;
- }
-
try {
std::string last_thread_id;
std::string last_mod;
--
2.30.0
next prev parent reply other threads:[~2021-02-08 0:42 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-08 0:40 Support flexible database location David Bremner
2021-02-08 0:40 ` [PATCH 01/23] lib: publish API for notmuch_database_reopen David Bremner
2021-02-08 0:40 ` [PATCH 02/23] lib: save path of xapian database in notmuch struct David Bremner
2021-02-08 0:40 ` [PATCH 03/23] lib: support reopening databases for write access David Bremner
2021-02-08 0:40 ` [PATCH 04/23] CLI/show: complete conversion to new configuration framework David Bremner
2021-02-08 0:40 ` [PATCH 05/23] lib/open: support NOTMUCH_DATABASE environment variable David Bremner
2021-02-08 0:40 ` David Bremner [this message]
2021-02-08 0:40 ` [PATCH 07/23] support splitting mail from database location David Bremner
2021-02-08 0:40 ` [PATCH 08/23] " David Bremner
2021-02-08 0:40 ` [PATCH 09/23] lib/open: factor out library intialization David Bremner
2021-02-08 0:40 ` [PATCH 10/23] lib/open: factor out the second half of n_d_open_with_config David Bremner
2021-02-08 0:40 ` [PATCH 11/23] lib/open: use _finish_open in n_d_create_with_config David Bremner
2021-02-08 0:40 ` [PATCH 12/23] lib/open: reuse directory checks from n_d_c_with_config David Bremner
2021-02-08 0:40 ` [PATCH 13/23] lib/open: open existing databases without .notmuch in path David Bremner
2021-02-08 0:41 ` [PATCH 14/23] lib/open: support XDG_DATA_HOME as a fallback database location David Bremner
2021-02-08 0:41 ` [PATCH 15/23] CLI/new: support split database and mail location David Bremner
2021-02-08 0:41 ` [PATCH 16/23] CLI/insert: support split database and mail root David Bremner
2021-02-08 0:41 ` [PATCH 17/23] lib: remove "path" from notmuch struct David Bremner
2021-02-08 0:41 ` [PATCH 18/23] CLI/show: add tests for raw output in split config David Bremner
2021-02-08 0:41 ` [PATCH 19/23] lib/compact: enable " David Bremner
2021-02-08 0:41 ` [PATCH 20/23] CLI/reply: tests for " David Bremner
2021-02-08 0:41 ` [PATCH 21/23] CLI/address: " David Bremner
2021-02-08 0:41 ` [PATCH 22/23] test: add tests for dump and restore in split configuration David Bremner
2021-02-08 0:41 ` [PATCH 23/23] test: add test for reindex in split configurations David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210208004109.1192719-7-david@tethera.net \
--to=david@tethera.net \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).