From: David Bremner <david@tethera.net>
To: notmuch@notmuchmail.org
Cc: David Bremner <david@tethera.net>
Subject: [PATCH 08/11] lib: catch Xapian exceptions in n_m_add_tag
Date: Sun, 5 Jul 2020 10:00:23 -0300 [thread overview]
Message-ID: <20200705130025.4057292-9-david@tethera.net> (raw)
In-Reply-To: <20200705130025.4057292-1-david@tethera.net>
This is mostly just (horizontal) code movement due to wrapping
everything in a try / catch.
---
lib/message.cc | 34 ++++++++++++++++++++--------------
test/T560-lib-error.sh | 1 -
2 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/lib/message.cc b/lib/message.cc
index b7d7c96b..7c9af079 100644
--- a/lib/message.cc
+++ b/lib/message.cc
@@ -1614,24 +1614,30 @@ notmuch_message_add_tag (notmuch_message_t *message, const char *tag)
notmuch_private_status_t private_status;
notmuch_status_t status;
- status = _notmuch_database_ensure_writable (message->notmuch);
- if (status)
- return status;
+ try {
+ status = _notmuch_database_ensure_writable (message->notmuch);
+ if (status)
+ return status;
- if (tag == NULL)
- return NOTMUCH_STATUS_NULL_POINTER;
+ if (tag == NULL)
+ return NOTMUCH_STATUS_NULL_POINTER;
- if (strlen (tag) > NOTMUCH_TAG_MAX)
- return NOTMUCH_STATUS_TAG_TOO_LONG;
+ if (strlen (tag) > NOTMUCH_TAG_MAX)
+ return NOTMUCH_STATUS_TAG_TOO_LONG;
- private_status = _notmuch_message_add_term (message, "tag", tag);
- if (private_status) {
- INTERNAL_ERROR ("_notmuch_message_add_term return unexpected value: %d\n",
- private_status);
- }
+ private_status = _notmuch_message_add_term (message, "tag", tag);
+ if (private_status) {
+ INTERNAL_ERROR ("_notmuch_message_add_term return unexpected value: %d\n",
+ private_status);
+ }
- if (! message->frozen)
- _notmuch_message_sync (message);
+ if (! message->frozen)
+ _notmuch_message_sync (message);
+
+ } catch (Xapian::Error &error) {
+ LOG_XAPIAN_EXCEPTION (message, error);
+ return NOTMUCH_STATUS_XAPIAN_EXCEPTION;
+ }
return NOTMUCH_STATUS_SUCCESS;
}
diff --git a/test/T560-lib-error.sh b/test/T560-lib-error.sh
index f3e126e3..7de13bb3 100755
--- a/test/T560-lib-error.sh
+++ b/test/T560-lib-error.sh
@@ -519,7 +519,6 @@ EOF
test_expect_equal_file EXPECTED OUTPUT
test_begin_subtest "Handle adding tag with closed database"
-test_subtest_known_broken
cat c_head2 - c_tail <<'EOF' | test_C ${MAIL_DIR}
{
notmuch_status_t status;
--
2.27.0
next prev parent reply other threads:[~2020-07-05 13:01 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-05 13:00 Third batch of API cleanup for exception safety David Bremner
2020-07-05 13:00 ` [PATCH 01/11] lib: add regression test for n_m_get_date; clarify API David Bremner
2020-07-05 13:00 ` [PATCH 02/11] lib: use LOG_XAPIAN_EXCEPTION in n_m_get_date David Bremner
2020-07-05 13:00 ` [PATCH 03/11] test: add known broken test for n_m_get_tags David Bremner
2020-07-05 13:00 ` [PATCH 04/11] lib: catch Xapian exceptions in n_m_get_tags David Bremner
2020-07-05 13:00 ` [PATCH 05/11] lib: add known broken test for n_m_count_files David Bremner
2020-07-05 13:00 ` [PATCH 06/11] lib: catch Xapian exceptions in n_m_count_files David Bremner
2020-07-05 13:00 ` [PATCH 07/11] test: add known broken test for n_m_add_tag with closed db David Bremner
2020-07-05 13:00 ` David Bremner [this message]
2020-07-05 13:00 ` [PATCH 09/11] test: add broken test for n_m_remove_tag David Bremner
2020-07-05 13:00 ` [PATCH 10/11] lib: catch Xapian exceptions in n_m_remove_tag David Bremner
2020-07-05 13:00 ` [PATCH 11/11] lib: use COERCE_STATUS in n_m_{add,remove}_tag David Bremner
2020-07-14 10:33 ` Third batch of API cleanup for exception safety David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200705130025.4057292-9-david@tethera.net \
--to=david@tethera.net \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).