The idea is to allow reuse in n_d_create_with_config. This is
primarily code movement, with some changes in error messages to reduce
the number of input parameters.
---
lib/open.cc | 118 +++++++++++++++++++++++++++++-----------------------
1 file changed, 67 insertions(+), 51 deletions(-)
diff --git a/lib/open.cc b/lib/open.cc
index ff298030..74fac37d 100644
--- a/lib/open.cc
+++ b/lib/open.cc
@@ -216,58 +216,17 @@ static void _init_libs () {
}
}
-notmuch_status_t
-notmuch_database_open_with_config (const char *database_path,
- notmuch_database_mode_t mode,
- const char *config_path,
- unused(const char *profile),
- notmuch_database_t **database,
- char **status_string)
+static notmuch_status_t
+_finish_open (notmuch_database_t *notmuch,
+ const char *profile,
+ notmuch_database_mode_t mode,
+ GKeyFile *key_file,
+ char **message_ptr)
{
notmuch_status_t status = NOTMUCH_STATUS_SUCCESS;
- void *local = talloc_new (NULL);
- notmuch_database_t *notmuch = NULL;
- char *notmuch_path, *incompat_features;
+ char *incompat_features;
char *message = NULL;
- struct stat st;
- int err;
unsigned int version;
- GKeyFile *key_file = NULL;
- static int initialized = 0;
-
- _init_libs ();
-
- 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;
- goto DONE;
- }
-
- err = stat (notmuch_path, &st);
- if (err) {
- IGNORE_RESULT (asprintf (&message, "Error opening database at %s: %s\n",
- notmuch_path, strerror (errno)));
- status = NOTMUCH_STATUS_FILE_ERROR;
- 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;
- }
try {
std::string last_thread_id;
@@ -290,7 +249,7 @@ notmuch_database_open_with_config (const char
*database_path,
"Error: Notmuch database at %s\n"
" has a newer database format
version (%u) than supported by this\n"
" version of notmuch (%u).\n",
- notmuch_path, version,
NOTMUCH_DATABASE_VERSION));
+ notmuch->path, version,
NOTMUCH_DATABASE_VERSION));
notmuch_database_destroy (notmuch);
notmuch = NULL;
status = NOTMUCH_STATUS_FILE_ERROR;
@@ -300,7 +259,7 @@ notmuch_database_open_with_config (const char
*database_path,
/* Check features. */
incompat_features = NULL;
notmuch->features = _notmuch_database_parse_features (
- local, notmuch->xapian_db->get_metadata ("features").c_str (),
+ notmuch, notmuch->xapian_db->get_metadata ("features").c_str (),
version, mode == NOTMUCH_DATABASE_MODE_READ_WRITE ? 'w' : 'r',
&incompat_features);
if (incompat_features) {
@@ -308,7 +267,7 @@ notmuch_database_open_with_config (const char
*database_path,
"Error: Notmuch database at %s\n"
" requires features (%s)\n"
" not supported by this version of
notmuch.\n",
- notmuch_path, incompat_features));
+ notmuch->path, incompat_features));
notmuch_database_destroy (notmuch);
notmuch = NULL;
status = NOTMUCH_STATUS_FILE_ERROR;
@@ -386,6 +345,63 @@ notmuch_database_open_with_config (const char
*database_path,
notmuch = NULL;
status = NOTMUCH_STATUS_XAPIAN_EXCEPTION;
}
+ DONE:
+ if (message_ptr)
+ *message_ptr = message;
+ return status;
+}
+
+notmuch_status_t
+notmuch_database_open_with_config (const char *database_path,
+ notmuch_database_mode_t mode,
+ const char *config_path,
+ unused(const char *profile),
+ notmuch_database_t **database,
+ char **status_string)
+{
+ notmuch_status_t status = NOTMUCH_STATUS_SUCCESS;
+ void *local = talloc_new (NULL);
+ notmuch_database_t *notmuch = NULL;
+ char *notmuch_path;
+ char *message = NULL;
+ struct stat st;
+ int err;
+ GKeyFile *key_file = NULL;
+
+ _init_libs ();
+
+ 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;
+ goto DONE;
+ }
+
+ err = stat (notmuch_path, &st);
+ if (err) {
+ IGNORE_RESULT (asprintf (&message, "Error opening database at %s: %s\n",
+ notmuch_path, strerror (errno)));
+ status = NOTMUCH_STATUS_FILE_ERROR;
+ goto DONE;
+ }
+
+ if (! (notmuch->xapian_path = talloc_asprintf (notmuch, "%s/%s",
notmuch_path, "xapian"))) {
+ status = NOTMUCH_STATUS_OUT_OF_MEMORY;
+ goto DONE;
+ }
+
+ status = _finish_open (notmuch, profile, mode, key_file, &message);
DONE:
talloc_free (local);
--
2.30.0
_______________________________________________
notmuch mailing list -- notmuch@notmuchmail.org
To unsubscribe send an email to notmuch-le...@notmuchmail.org
