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 uNxuFXJIFF85JgAA0tVLHw (envelope-from ) for ; Sun, 19 Jul 2020 13:19:46 +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 QAluEXJIFF+JQgAAB5/wlQ (envelope-from ) for ; Sun, 19 Jul 2020 13:19:46 +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 (2048 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id DEFEC9401AE for ; Sun, 19 Jul 2020 13:19:45 +0000 (UTC) Received: from [144.217.243.247] (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 2A6C326BCE; Sun, 19 Jul 2020 09:19:20 -0400 (EDT) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by mail.notmuchmail.org (Postfix) with ESMTP id A66271FC4E for ; Sun, 19 Jul 2020 09:19:08 -0400 (EDT) Received: by fethera.tethera.net (Postfix, from userid 1001) id A039E609DB; Sun, 19 Jul 2020 09:19:08 -0400 (EDT) Received: (nullmailer pid 158761 invoked by uid 1000); Sun, 19 Jul 2020 13:19:01 -0000 From: David Bremner To: notmuch@notmuchmail.org Cc: David Bremner Subject: [PATCH 7/8] lib: fix error return bug with n_d_set_config. Date: Sun, 19 Jul 2020 10:18:56 -0300 Message-Id: <20200719131857.158655-8-david@tethera.net> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200719131857.158655-1-david@tethera.net> References: <20200719131857.158655-1-david@tethera.net> MIME-Version: 1.0 Message-ID-Hash: VOVMHZ7RUQVKHZHSST3N7NVESLNBQZJT X-Message-ID-Hash: VOVMHZ7RUQVKHZHSST3N7NVESLNBQZJT 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: imhsUbYi+aLV The catch block either needs to return, or the function needs to return "status". Choose the latter for consistency with n_d_get_config. --- lib/config.cc | 2 +- test/T562-lib-database.sh | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/config.cc b/lib/config.cc index 292f0288..20036471 100644 --- a/lib/config.cc +++ b/lib/config.cc @@ -60,7 +60,7 @@ notmuch_database_set_config (notmuch_database_t *notmuch, _notmuch_database_log (notmuch, "Error: A Xapian exception occurred setting metadata: %s\n", error.get_msg ().c_str ()); } - return NOTMUCH_STATUS_SUCCESS; + return status; } static notmuch_status_t diff --git a/test/T562-lib-database.sh b/test/T562-lib-database.sh index 46a1b843..81d5c540 100755 --- a/test/T562-lib-database.sh +++ b/test/T562-lib-database.sh @@ -349,7 +349,6 @@ EOF test_expect_equal_file EXPECTED OUTPUT test_begin_subtest "set config in closed database" -test_subtest_known_broken cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR} { EXPECT0(notmuch_database_close (db)); -- 2.27.0