From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 2JH7IR/PAV8lOwAA0tVLHw (envelope-from ) for ; Sun, 05 Jul 2020 13:01:19 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id MLXoHR/PAV+6SQAAB5/wlQ (envelope-from ) for ; Sun, 05 Jul 2020 13:01:19 +0000 Received: from mail.notmuchmail.org (nmbug.tethera.net [IPv6:2607:5300:201:3100::1657]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 37E8094004E for ; Sun, 5 Jul 2020 13:01:19 +0000 (UTC) Received: from [144.217.243.247] (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 88E3E1FCA5; Sun, 5 Jul 2020 09:01:03 -0400 (EDT) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by mail.notmuchmail.org (Postfix) with ESMTP id 6E92C1FC3C for ; Sun, 5 Jul 2020 09:00:56 -0400 (EDT) Received: by fethera.tethera.net (Postfix, from userid 1001) id 684E6613B0; Sun, 5 Jul 2020 09:00:56 -0400 (EDT) Received: (nullmailer pid 4057436 invoked by uid 1000); Sun, 05 Jul 2020 13:00:51 -0000 From: David Bremner To: notmuch@notmuchmail.org Cc: David Bremner Subject: [PATCH 11/11] lib: use COERCE_STATUS in n_m_{add,remove}_tag Date: Sun, 5 Jul 2020 10:00:26 -0300 Message-Id: <20200705130025.4057292-12-david@tethera.net> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200705130025.4057292-1-david@tethera.net> References: <20200705130025.4057292-1-david@tethera.net> MIME-Version: 1.0 Message-ID-Hash: JG2ZRW2KYY2UB6DQ376CJDMNMLF75M2A X-Message-ID-Hash: JG2ZRW2KYY2UB6DQ376CJDMNMLF75M2A X-MailFrom: bremner@tethera.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.1 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2607:5300:201:3100::1657 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Spam-Score: 1.53 X-TUID: pKaE6NDZINTt 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