From be9e3ee3132457ea5936bd1225294bdfe3949a4c Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Sun, 25 Oct 2009 15:01:20 -0700 Subject: [PATCH] _notmuch_database_linke_message: Fix error-status propagation. The _notmuch_database_link_message_to_parents function was void in an earlier draft. Now, ensure that we don't miss any error return value from it. --- database.cc | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/database.cc b/database.cc index ea207055..cd057846 100644 --- a/database.cc +++ b/database.cc @@ -798,20 +798,24 @@ _notmuch_database_link_message (notmuch_database_t *notmuch, notmuch_message_t *message, notmuch_message_file_t *message_file) { - notmuch_status_t ret = NOTMUCH_STATUS_SUCCESS; + notmuch_status_t status; const char *thread_id = NULL; - _notmuch_database_link_message_to_parents (notmuch, message, - message_file, - &thread_id); + status = _notmuch_database_link_message_to_parents (notmuch, message, + message_file, + &thread_id); + if (status) + return status; - ret = _notmuch_database_link_message_to_children (notmuch, message, - &thread_id); + status = _notmuch_database_link_message_to_children (notmuch, message, + &thread_id); + if (status) + return status; if (thread_id == NULL) _notmuch_message_ensure_thread_id (message); - return ret; + return NOTMUCH_STATUS_SUCCESS; } notmuch_status_t