From: David Bremner <david@tethera.net>
To: David Bremner <david@tethera.net>, notmuch@notmuchmail.org
Cc: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Subject: [PATCH] lib: return NULL from n_d_get_default_indexopts on error
Date: Sun, 26 Jul 2020 08:48:28 -0300 [thread overview]
Message-ID: <20200726114828.1447936-1-david@tethera.net> (raw)
In-Reply-To: <87tuy3my6z.fsf@tethera.net>
This is a rare and probably serious programming error, so better not
to silently return a default value.
---
lib/indexopts.c | 2 +-
lib/notmuch.h | 1 +
test/T562-lib-database.sh | 1 -
3 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/indexopts.c b/lib/indexopts.c
index 1e8d180e..82a0026f 100644
--- a/lib/indexopts.c
+++ b/lib/indexopts.c
@@ -32,7 +32,7 @@ notmuch_database_get_default_indexopts (notmuch_database_t *db)
char *decrypt_policy;
notmuch_status_t err = notmuch_database_get_config (db, "index.decrypt", &decrypt_policy);
if (err)
- return ret;
+ return NULL;
if (decrypt_policy) {
if ((! (strcasecmp (decrypt_policy, "true"))) ||
diff --git a/lib/notmuch.h b/lib/notmuch.h
index 1fe62914..f3cb0fe2 100644
--- a/lib/notmuch.h
+++ b/lib/notmuch.h
@@ -2325,6 +2325,7 @@ notmuch_config_list_destroy (notmuch_config_list_t *config_list);
* added to the index. At the moment it is a featureless stub.
*
* @since libnotmuch 5.1 (notmuch 0.26)
+ * @retval NULL in case of error
*/
notmuch_indexopts_t *
notmuch_database_get_default_indexopts (notmuch_database_t *db);
diff --git a/test/T562-lib-database.sh b/test/T562-lib-database.sh
index 815c9856..d6097418 100755
--- a/test/T562-lib-database.sh
+++ b/test/T562-lib-database.sh
@@ -373,7 +373,6 @@ EOF
test_expect_equal_file EXPECTED OUTPUT
test_begin_subtest "get indexopts from closed database"
-test_subtest_known_broken
cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}
{
notmuch_indexopts_t *result;
--
2.27.0
next prev parent reply other threads:[~2020-07-26 11:48 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-19 13:18 batch 7, API exception handline cleanup David Bremner
2020-07-19 13:18 ` [PATCH 1/8] test: add known broken test for notmuch_database_remove_message David Bremner
2020-07-19 13:18 ` [PATCH 2/8] lib: rename _n_d_create to _n_d_find_or_create David Bremner
2020-07-19 13:18 ` [PATCH 3/8] lib: add regression test for n_d_find_message_by_filename David Bremner
2020-07-19 13:18 ` [PATCH 4/8] lib: add regresion test for n_d_get_all_tags David Bremner
2020-07-19 13:18 ` [PATCH 5/8] test: add regression test for n_d_get_config David Bremner
2020-07-19 13:18 ` [PATCH 6/8] test: add known broken test for n_d_set_config David Bremner
2020-07-19 13:18 ` [PATCH 7/8] lib: fix error return bug with n_d_set_config David Bremner
2020-07-19 13:18 ` [PATCH 8/8] test: add known broken test for n_d_get_default_indexopts David Bremner
2020-07-19 13:28 ` David Bremner
2020-07-26 11:48 ` David Bremner [this message]
2020-07-27 11:25 ` batch 7, API exception handline cleanup 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=20200726114828.1447936-1-david@tethera.net \
--to=david@tethera.net \
--cc=dkg@fifthhorseman.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).