debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-22 02:48:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib: rename _n_d_create to _n_d_find_or_create

Browse source 
The error message and name were confusing when called in some "read
only" context.
This commit is contained in:
David Bremner 2020-07-19 07:36:47 -03:00
parent 97c887282a
commit ce360ce4c9
5 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/database.cc
View file

@ -1605,8 +1605,8 @@ notmuch_database_upgrade (notmuch_database_t *notmuch,
mtime = Xapian::sortable_unserialise ( mtime = Xapian::sortable_unserialise (
document.get_value (NOTMUCH_VALUE_TIMESTAMP)); document.get_value (NOTMUCH_VALUE_TIMESTAMP));
directory = _notmuch_directory_create (notmuch, term.c_str () + 10, directory = _notmuch_directory_find_or_create (notmuch, term.c_str () + 10,
NOTMUCH_FIND_CREATE, &status); NOTMUCH_FIND_CREATE, &status);
notmuch_directory_set_mtime (directory, mtime); notmuch_directory_set_mtime (directory, mtime);
notmuch_directory_destroy (directory); notmuch_directory_destroy (directory);
@ -1878,7 +1878,7 @@ _notmuch_database_find_directory_id (notmuch_database_t *notmuch,
return NOTMUCH_STATUS_SUCCESS; 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) { if (status || ! directory) {
*directory_id = -1; *directory_id = -1;
return status; return status;
@ -1988,8 +1988,8 @@ notmuch_database_get_directory (notmuch_database_t *notmuch,
*directory = NULL; *directory = NULL;
try { try {
*directory = _notmuch_directory_create (notmuch, path, *directory = _notmuch_directory_find_or_create (notmuch, path,
NOTMUCH_FIND_LOOKUP, &status); NOTMUCH_FIND_LOOKUP, &status);
} catch (const Xapian::Error &error) { } catch (const Xapian::Error &error) {
_notmuch_database_log (notmuch, "A Xapian exception occurred getting directory: %s.\n", _notmuch_database_log (notmuch, "A Xapian exception occurred getting directory: %s.\n",
error.get_msg ().c_str ()); error.get_msg ().c_str ());

10
lib/directory.cc
View file

@ -94,10 +94,10 @@ find_directory_document (notmuch_database_t *notmuch,
* NOTMUCH_STATUS_SUCCESS and this returns NULL. * NOTMUCH_STATUS_SUCCESS and this returns NULL.
*/ */
notmuch_directory_t * notmuch_directory_t *
_notmuch_directory_create (notmuch_database_t *notmuch, _notmuch_directory_find_or_create (notmuch_database_t *notmuch,
const char *path, const char *path,
notmuch_find_flags_t flags, notmuch_find_flags_t flags,
notmuch_status_t *status_ret) notmuch_status_t *status_ret)
{ {
Xapian::WritableDatabase *db; Xapian::WritableDatabase *db;
notmuch_directory_t *directory; notmuch_directory_t *directory;
@ -187,7 +187,7 @@ _notmuch_directory_create (notmuch_database_t *notmuch,
directory->doc.get_value (NOTMUCH_VALUE_TIMESTAMP)); directory->doc.get_value (NOTMUCH_VALUE_TIMESTAMP));
} catch (const Xapian::Error &error) { } catch (const Xapian::Error &error) {
_notmuch_database_log (notmuch, _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 ()); error.get_msg ().c_str ());
notmuch->exception_reported = true; notmuch->exception_reported = true;
notmuch_directory_destroy (directory); notmuch_directory_destroy (directory);

8
lib/notmuch-private.h
View file

@ -251,10 +251,10 @@ _notmuch_database_filename_to_direntry (void *ctx,
/* directory.cc */ /* directory.cc */
notmuch_directory_t * notmuch_directory_t *
_notmuch_directory_create (notmuch_database_t *notmuch, _notmuch_directory_find_or_create (notmuch_database_t *notmuch,
const char *path, const char *path,
notmuch_find_flags_t flags, notmuch_find_flags_t flags,
notmuch_status_t *status_ret); notmuch_status_t *status_ret);
unsigned int unsigned int
_notmuch_directory_get_document_id (notmuch_directory_t *directory); _notmuch_directory_get_document_id (notmuch_directory_t *directory);

2
test/T560-lib-error.sh
View file

@ -275,7 +275,7 @@ sed 's/^\(A Xapian exception [^:]*\):.*$/\1/' < OUTPUT > OUTPUT.clean
cat <<'EOF' >EXPECTED cat <<'EOF' >EXPECTED
== stdout == == stdout ==
== stderr == == stderr ==
A Xapian exception occurred creating a directory A Xapian exception occurred finding/creating a directory
EOF EOF
test_expect_equal_file EXPECTED OUTPUT.clean test_expect_equal_file EXPECTED OUTPUT.clean
restore_database restore_database

3
test/T562-lib-database.sh
View file

@ -234,7 +234,7 @@ cat <<EOF > EXPECTED
== stdout == == stdout ==
1 1
== stderr == == stderr ==
A Xapian exception occurred creating a directory: Database has been closed. A Xapian exception occurred finding/creating a directory: Database has been closed.
EOF EOF
test_expect_equal_file EXPECTED OUTPUT test_expect_equal_file EXPECTED OUTPUT
@ -289,7 +289,6 @@ EOF
test_expect_equal_file EXPECTED OUTPUT test_expect_equal_file EXPECTED OUTPUT
test_begin_subtest "remove message file with a closed db" test_begin_subtest "remove message file with a closed db"
test_subtest_known_broken
cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR} cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}
{ {
EXPECT0(notmuch_database_close (db)); EXPECT0(notmuch_database_close (db));