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

lib/message: check return status of _n_m_{add,remove}_term

Browse source 
Xapian exceptions are not something that can be ignored, in general.
This commit is contained in:
David Bremner 2022-05-23 20:38:59 -03:00
parent 7d5a9bd3ae
commit b102d0ad11
1 changed files with 34 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
lib/message.cc
View file

@ -828,7 +828,10 @@ _notmuch_message_add_folder_terms (notmuch_message_t *message,
*folder = '\0'; *folder = '\0';
} }
_notmuch_message_add_term (message, "folder", folder); if (notmuch_status_t status = COERCE_STATUS (_notmuch_message_add_term (message, "folder",
folder),
"adding folder term"))
return status;
talloc_free (folder); talloc_free (folder);
@ -843,8 +846,13 @@ 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)
{ {
notmuch_status_t status;
/* Add exact "path:" term. */ /* Add exact "path:" term. */
_notmuch_message_add_term (message, "path", directory); status = COERCE_STATUS (_notmuch_message_add_term (message, "path", directory),
"adding path term");
if (status)
return status;
if (strlen (directory)) { if (strlen (directory)) {
char *path, *p; char *path, *p;
@ -857,7 +865,10 @@ _notmuch_message_add_path_terms (notmuch_message_t *message,
for (p = path + strlen (path) - 1; p > path; p--) { for (p = path + strlen (path) - 1; p > path; p--) {
if (*p == '/') { if (*p == '/') {
strcpy (p, RECURSIVE_SUFFIX); strcpy (p, RECURSIVE_SUFFIX);
_notmuch_message_add_term (message, "path", path); status = COERCE_STATUS (_notmuch_message_add_term (message, "path", path),
"adding path term");
if (status)
return status;
} }
} }
@ -865,7 +876,10 @@ _notmuch_message_add_path_terms (notmuch_message_t *message,
} }
/* Recursive all-matching path:** for consistency. */ /* Recursive all-matching path:** for consistency. */
_notmuch_message_add_term (message, "path", "**"); status = COERCE_STATUS (_notmuch_message_add_term (message, "path", "**"),
"adding path term");
if (status)
return status;
return NOTMUCH_STATUS_SUCCESS; return NOTMUCH_STATUS_SUCCESS;
} }
@ -944,7 +958,10 @@ _notmuch_message_add_filename (notmuch_message_t *message,
/* New file-direntry allows navigating to this message with /* New file-direntry allows navigating to this message with
* notmuch_directory_get_child_files() . */ * notmuch_directory_get_child_files() . */
_notmuch_message_add_term (message, "file-direntry", direntry); status = COERCE_STATUS (_notmuch_message_add_term (message, "file-direntry", direntry),
"adding file-direntry term");
if (status)
return status;
_notmuch_message_add_folder_terms (message, directory); _notmuch_message_add_folder_terms (message, directory);
_notmuch_message_add_path_terms (message, directory); _notmuch_message_add_path_terms (message, directory);
@ -1466,7 +1483,7 @@ _notmuch_message_close (notmuch_message_t *message)
* *
* This change will not be reflected in the database until the next * This change will not be reflected in the database until the next
* call to _notmuch_message_sync. */ * call to _notmuch_message_sync. */
notmuch_private_status_t NODISCARD notmuch_private_status_t
_notmuch_message_add_term (notmuch_message_t *message, _notmuch_message_add_term (notmuch_message_t *message,
const char *prefix_name, const char *prefix_name,
const char *value) const char *value)
@ -1541,7 +1558,7 @@ _notmuch_message_gen_terms (notmuch_message_t *message,
* *
* This change will not be reflected in the database until the next * This change will not be reflected in the database until the next
* call to _notmuch_message_sync. */ * call to _notmuch_message_sync. */
notmuch_private_status_t NODISCARD notmuch_private_status_t
_notmuch_message_remove_term (notmuch_message_t *message, _notmuch_message_remove_term (notmuch_message_t *message,
const char *prefix_name, const char *prefix_name,
const char *value) const char *value)
@ -2274,7 +2291,11 @@ notmuch_message_reindex (notmuch_message_t *message,
if (thread_id == NULL) if (thread_id == NULL)
thread_id = orig_thread_id; thread_id = orig_thread_id;
_notmuch_message_add_term (message, "thread", thread_id); ret = COERCE_STATUS (_notmuch_message_add_term (message, "thread", thread_id),
"adding thread term");
if (ret)
goto DONE;
/* Take header values only from first filename */ /* Take header values only from first filename */
if (found == 0) if (found == 0)
_notmuch_message_set_header_values (message, date, from, subject); _notmuch_message_set_header_values (message, date, from, subject);
@ -2292,7 +2313,11 @@ notmuch_message_reindex (notmuch_message_t *message,
} }
if (found == 0) { if (found == 0) {
/* put back thread id to help cleanup */ /* put back thread id to help cleanup */
_notmuch_message_add_term (message, "thread", orig_thread_id); ret = COERCE_STATUS (_notmuch_message_add_term (message, "thread", orig_thread_id),
"adding thread term");
if (ret)
goto DONE;
ret = _notmuch_message_delete (message); ret = _notmuch_message_delete (message);
} else { } else {
_notmuch_message_sync (message); _notmuch_message_sync (message);