unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / code / Atom feed
From: David Bremner <david@tethera.net>
To: notmuch@notmuchmail.org
Cc: David Bremner <david@tethera.net>
Subject: [PATCH 11/11] lib: use COERCE_STATUS in n_m_{add,remove}_tag
Date: Sun,  5 Jul 2020 10:00:26 -0300	[thread overview]
Message-ID: <20200705130025.4057292-12-david@tethera.net> (raw)
In-Reply-To: <20200705130025.4057292-1-david@tethera.net>

Currently I don't know of a good way of testing this, but at least in
principle a Xapian exception in _notmuch_message_{add,remove}_term
would cause an abort in the library.
---
 lib/message.cc | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/message.cc b/lib/message.cc
index e4463d05..4e1be986 100644
--- a/lib/message.cc
+++ b/lib/message.cc
@@ -1627,8 +1627,9 @@ notmuch_message_add_tag (notmuch_message_t *message, const char *tag)
 
 	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);
+	    return COERCE_STATUS (private_status,
+				  "_notmuch_message_remove_term return unexpected value: %d\n",
+				  private_status);
 	}
 
 	if (! message->frozen)
@@ -1661,8 +1662,9 @@ notmuch_message_remove_tag (notmuch_message_t *message, const char *tag)
 
 	private_status = _notmuch_message_remove_term (message, "tag", tag);
 	if (private_status) {
-	    INTERNAL_ERROR ("_notmuch_message_remove_term return unexpected value: %d\n",
-			    private_status);
+	    return COERCE_STATUS (private_status,
+				  "_notmuch_message_remove_term return unexpected value: %d\n",
+				  private_status);
 	}
 
 	if (! message->frozen)
-- 
2.27.0

  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 ` [PATCH 08/11] lib: catch Xapian exceptions in n_m_add_tag David Bremner
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 ` David Bremner [this message]
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-12-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).