From c76832a2037d375ab99dbeba3b37d1aca2103a36 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sat, 11 Jul 2020 15:30:04 -0300 Subject: [PATCH] cli/search: replace deprecated notmuch_message_get_flag Our handling of errors is all or nothing here, but it's an improvement on the status quo, and it avoids rippling internal API changes. --- notmuch-search.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/notmuch-search.c b/notmuch-search.c index fd0b58c5..2805d960 100644 --- a/notmuch-search.c +++ b/notmuch-search.c @@ -90,9 +90,13 @@ get_thread_query (notmuch_thread_t *thread, notmuch_messages_move_to_next (messages)) { notmuch_message_t *message = notmuch_messages_get (messages); const char *mid = notmuch_message_get_message_id (message); + notmuch_bool_t is_set; + char **buf; + + if (notmuch_message_get_flag_st (message, NOTMUCH_MESSAGE_FLAG_MATCH, &is_set)) + return -1; /* Determine which query buffer to extend */ - char **buf = notmuch_message_get_flag ( - message, NOTMUCH_MESSAGE_FLAG_MATCH) ? matched_out : unmatched_out; + buf = is_set ? matched_out : unmatched_out; /* Add this message's id: query. Since "id" is an exclusive * prefix, it is implicitly 'or'd together, so we only need to * join queries with a space. */