debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-12-22 17:34:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib/message: check return status from _n_m_add_{path,folder}_terms

Browse source 
Mainly to propagate information about Xapian exceptions.
This commit is contained in:
David Bremner 2022-05-23 20:39:00 -03:00
parent b102d0ad11
commit 879ec9d76a
1 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
lib/message.cc
View file

@ -792,7 +792,7 @@ is_maildir (const char *p)
} }
/* Add "folder:" term for directory. */ /* Add "folder:" term for directory. */
static notmuch_status_t NODISCARD static notmuch_status_t
_notmuch_message_add_folder_terms (notmuch_message_t *message, _notmuch_message_add_folder_terms (notmuch_message_t *message,
const char *directory) const char *directory)
{ {
@ -842,7 +842,7 @@ _notmuch_message_add_folder_terms (notmuch_message_t *message,
#define RECURSIVE_SUFFIX "/**" #define RECURSIVE_SUFFIX "/**"
/* Add "path:" terms for directory. */ /* Add "path:" terms for directory. */
static notmuch_status_t NODISCARD static notmuch_status_t
_notmuch_message_add_path_terms (notmuch_message_t *message, _notmuch_message_add_path_terms (notmuch_message_t *message,
const char *directory) const char *directory)
{ {
@ -898,6 +898,7 @@ _notmuch_message_add_directory_terms (void *ctx, notmuch_message_t *message)
const char *direntry, *directory; const char *direntry, *directory;
char *colon; char *colon;
const std::string &term = *i; const std::string &term = *i;
notmuch_status_t term_status;
/* Terminate loop at first term without desired prefix. */ /* Terminate loop at first term without desired prefix. */
if (strncmp (term.c_str (), direntry_prefix, direntry_prefix_len)) if (strncmp (term.c_str (), direntry_prefix, direntry_prefix_len))
@ -918,8 +919,13 @@ _notmuch_message_add_directory_terms (void *ctx, notmuch_message_t *message)
message->notmuch, message->notmuch,
directory_id); directory_id);
_notmuch_message_add_folder_terms (message, directory); term_status = _notmuch_message_add_folder_terms (message, directory);
_notmuch_message_add_path_terms (message, directory); if (term_status)
return term_status;
term_status = _notmuch_message_add_path_terms (message, directory);
if (term_status)
return term_status;
} }
return status; return status;
@ -963,8 +969,13 @@ _notmuch_message_add_filename (notmuch_message_t *message,
if (status) if (status)
return status; return status;
_notmuch_message_add_folder_terms (message, directory); status = _notmuch_message_add_folder_terms (message, directory);
_notmuch_message_add_path_terms (message, directory); if (status)
return status;
status = _notmuch_message_add_path_terms (message, directory);
if (status)
return status;
talloc_free (local); talloc_free (local);