aboutsummaryrefslogtreecommitdiff
path: root/lib/database.cc
diff options
context:
space:
mode:
authorDavid Bremner <david@tethera.net>2020-07-19 07:36:47 -0300
committerDavid Bremner <david@tethera.net>2020-07-22 19:52:55 -0300
commitce360ce4c99597946949317aa40892536c9ebc05 (patch)
treee966b0af860af16fdce209f7b09cd89f6c08e2f0 /lib/database.cc
parent97c887282a6688323822137a21ea0bfc2344b5c9 (diff)
lib: rename _n_d_create to _n_d_find_or_create
The error message and name were confusing when called in some "read only" context.
Diffstat (limited to 'lib/database.cc')
-rw-r--r--lib/database.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/database.cc b/lib/database.cc
index 4ff748f6..2aff56be 100644
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -1605,8 +1605,8 @@ notmuch_database_upgrade (notmuch_database_t *notmuch,
mtime = Xapian::sortable_unserialise (
document.get_value (NOTMUCH_VALUE_TIMESTAMP));
- directory = _notmuch_directory_create (notmuch, term.c_str () + 10,
- NOTMUCH_FIND_CREATE, &status);
+ directory = _notmuch_directory_find_or_create (notmuch, term.c_str () + 10,
+ NOTMUCH_FIND_CREATE, &status);
notmuch_directory_set_mtime (directory, mtime);
notmuch_directory_destroy (directory);
@@ -1878,7 +1878,7 @@ _notmuch_database_find_directory_id (notmuch_database_t *notmuch,
return NOTMUCH_STATUS_SUCCESS;
}
- directory = _notmuch_directory_create (notmuch, path, flags, &status);
+ directory = _notmuch_directory_find_or_create (notmuch, path, flags, &status);
if (status || ! directory) {
*directory_id = -1;
return status;
@@ -1988,8 +1988,8 @@ notmuch_database_get_directory (notmuch_database_t *notmuch,
*directory = NULL;
try {
- *directory = _notmuch_directory_create (notmuch, path,
- NOTMUCH_FIND_LOOKUP, &status);
+ *directory = _notmuch_directory_find_or_create (notmuch, path,
+ NOTMUCH_FIND_LOOKUP, &status);
} catch (const Xapian::Error &error) {
_notmuch_database_log (notmuch, "A Xapian exception occurred getting directory: %s.\n",
error.get_msg ().c_str ());