diff options
| author | David Bremner <david@tethera.net> | 2020-07-19 07:36:47 -0300 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2020-07-22 19:52:55 -0300 |
| commit | ce360ce4c99597946949317aa40892536c9ebc05 (patch) | |
| tree | e966b0af860af16fdce209f7b09cd89f6c08e2f0 /lib | |
| parent | 97c887282a6688323822137a21ea0bfc2344b5c9 (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')
| -rw-r--r-- | lib/database.cc | 10 | ||||
| -rw-r--r-- | lib/directory.cc | 10 | ||||
| -rw-r--r-- | lib/notmuch-private.h | 8 |
3 files changed, 14 insertions, 14 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 ()); diff --git a/lib/directory.cc b/lib/directory.cc index af71f402..09b49245 100644 --- a/lib/directory.cc +++ b/lib/directory.cc @@ -94,10 +94,10 @@ find_directory_document (notmuch_database_t *notmuch, * NOTMUCH_STATUS_SUCCESS and this returns NULL. */ notmuch_directory_t * -_notmuch_directory_create (notmuch_database_t *notmuch, - const char *path, - notmuch_find_flags_t flags, - notmuch_status_t *status_ret) +_notmuch_directory_find_or_create (notmuch_database_t *notmuch, + const char *path, + notmuch_find_flags_t flags, + notmuch_status_t *status_ret) { Xapian::WritableDatabase *db; notmuch_directory_t *directory; @@ -187,7 +187,7 @@ _notmuch_directory_create (notmuch_database_t *notmuch, directory->doc.get_value (NOTMUCH_VALUE_TIMESTAMP)); } catch (const Xapian::Error &error) { _notmuch_database_log (notmuch, - "A Xapian exception occurred creating a directory: %s.\n", + "A Xapian exception occurred finding/creating a directory: %s.\n", error.get_msg ().c_str ()); notmuch->exception_reported = true; notmuch_directory_destroy (directory); diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h index 28ced3a2..2bbbb293 100644 --- a/lib/notmuch-private.h +++ b/lib/notmuch-private.h @@ -251,10 +251,10 @@ _notmuch_database_filename_to_direntry (void *ctx, /* directory.cc */ notmuch_directory_t * -_notmuch_directory_create (notmuch_database_t *notmuch, - const char *path, - notmuch_find_flags_t flags, - notmuch_status_t *status_ret); +_notmuch_directory_find_or_create (notmuch_database_t *notmuch, + const char *path, + notmuch_find_flags_t flags, + notmuch_status_t *status_ret); unsigned int _notmuch_directory_get_document_id (notmuch_directory_t *directory); |