lib/open: use _finish_open in n_d_create_with_config

This avoids reading the configuration file twice.

diff --git a/lib/open.cc b/lib/open.cc
index cc099e51123eb5b5a37e3f4322dfc2d012122e04..09afd29493dbbd25b0d88f3b75cd3f94cc41ddba 100644 (file)
--- a/lib/open.cc
+++ b/lib/open.cc
@@ -550,12 +550,16 @@ notmuch_database_create_with_config (const char *database_path,
        goto DONE;
     }
 
-    /* XXX this reads the config file twice, which is a bit wasteful */
-    status = notmuch_database_open_with_config (database_path,
-                                               NOTMUCH_DATABASE_MODE_READ_WRITE,
-                                               config_path,
-                                               profile,
-                                               &notmuch, &message);
+    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,
+                          NOTMUCH_DATABASE_MODE_READ_WRITE,
+                          key_file,
+                          &message);
     if (status)
        goto DONE;