X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=lib%2Fconfig.cc;h=dae0ff0e7f92d3e70681bff9589c38a9a814f6d4;hb=73b8f0b8d71af395667022395b6d6bb692c3aaf2;hp=a8bcdf831b453d93c4f8b4a43c2b7dd0d43e8cda;hpb=8e2251484214d39bdb4872216239bd38eb7729ab;p=notmuch

diff --git a/lib/config.cc b/lib/config.cc
index a8bcdf83..dae0ff0e 100644
--- a/lib/config.cc
+++ b/lib/config.cc
@@ -45,22 +45,20 @@ notmuch_database_set_config (notmuch_database_t *notmuch,
 			     const char *value)
 {
     notmuch_status_t status;
-    Xapian::WritableDatabase *db;
 
     status = _notmuch_database_ensure_writable (notmuch);
     if (status)
 	return status;
 
     try {
-	db = static_cast <Xapian::WritableDatabase *> (notmuch->xapian_db);
-	db->set_metadata (CONFIG_PREFIX + key, value);
+	notmuch->writable_xapian_db->set_metadata (CONFIG_PREFIX + key, value);
     } catch (const Xapian::Error &error) {
 	status = NOTMUCH_STATUS_XAPIAN_EXCEPTION;
 	notmuch->exception_reported = true;
 	_notmuch_database_log (notmuch, "Error: A Xapian exception occurred setting metadata: %s\n",
-			       error.get_msg().c_str());
+			       error.get_msg ().c_str ());
     }
-    return NOTMUCH_STATUS_SUCCESS;
+    return status;
 }
 
 static notmuch_status_t
@@ -76,7 +74,7 @@ _metadata_value (notmuch_database_t *notmuch,
 	status = NOTMUCH_STATUS_XAPIAN_EXCEPTION;
 	notmuch->exception_reported = true;
 	_notmuch_database_log (notmuch, "Error: A Xapian exception occurred getting metadata: %s\n",
-			       error.get_msg().c_str());
+			       error.get_msg ().c_str ());
     }
     return status;
 }
@@ -123,11 +121,11 @@ notmuch_database_get_config_list (notmuch_database_t *notmuch,
     try {
 
 	new(&(list->iterator)) Xapian::TermIterator (notmuch->xapian_db->metadata_keys_begin
-						     (CONFIG_PREFIX + (prefix ? prefix : "")));
+							 (CONFIG_PREFIX + (prefix ? prefix : "")));
 
     } catch (const Xapian::Error &error) {
 	_notmuch_database_log (notmuch, "A Xapian exception occurred getting metadata iterator: %s.\n",
-			       error.get_msg().c_str());
+			       error.get_msg ().c_str ());
 	notmuch->exception_reported = true;
 	status = NOTMUCH_STATUS_XAPIAN_EXCEPTION;
     }