debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2025-01-10 18:43:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib: catch Xapian exceptions in n_m_add_tag

Browse source 
This is mostly just (horizontal) code movement due to wrapping
everything in a try / catch.
This commit is contained in:
David Bremner 2020-07-05 10:00:23 -03:00
parent 503c035077
commit 33dd5fdc69
2 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
lib/message.cc
View file

@ -1589,25 +1589,31 @@ notmuch_message_add_tag (notmuch_message_t *message, const char *tag)
notmuch_private_status_t private_status; notmuch_private_status_t private_status;
notmuch_status_t status; notmuch_status_t status;
status = _notmuch_database_ensure_writable (message->notmuch); try {
if (status) status = _notmuch_database_ensure_writable (message->notmuch);
return status; if (status)
return status;
if (tag == NULL) if (tag == NULL)
return NOTMUCH_STATUS_NULL_POINTER; return NOTMUCH_STATUS_NULL_POINTER;
if (strlen (tag) > NOTMUCH_TAG_MAX) if (strlen (tag) > NOTMUCH_TAG_MAX)
return NOTMUCH_STATUS_TAG_TOO_LONG; return NOTMUCH_STATUS_TAG_TOO_LONG;
private_status = _notmuch_message_add_term (message, "tag", tag); private_status = _notmuch_message_add_term (message, "tag", tag);
if (private_status) { if (private_status) {
INTERNAL_ERROR ("_notmuch_message_add_term return unexpected value: %d\n", INTERNAL_ERROR ("_notmuch_message_add_term return unexpected value: %d\n",
private_status); private_status);
}
if (! message->frozen)
_notmuch_message_sync (message);
} catch (Xapian::Error &error) {
LOG_XAPIAN_EXCEPTION (message, error);
return NOTMUCH_STATUS_XAPIAN_EXCEPTION;
} }
if (! message->frozen)
_notmuch_message_sync (message);
return NOTMUCH_STATUS_SUCCESS; return NOTMUCH_STATUS_SUCCESS;
} }

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

@ -503,7 +503,6 @@ EOF
test_expect_equal_file EXPECTED OUTPUT test_expect_equal_file EXPECTED OUTPUT
test_begin_subtest "Handle adding tag with closed database" test_begin_subtest "Handle adding tag with closed database"
test_subtest_known_broken
cat c_head2 - c_tail <<'EOF' | test_C ${MAIL_DIR} cat c_head2 - c_tail <<'EOF' | test_C ${MAIL_DIR}
{ {
notmuch_status_t status; notmuch_status_t status;