[PATCH 2/2] lib: fix return value for n_directory_delete

Subject: [PATCH 2/2] lib: fix return value for n_directory_delete

Date: Sun, 26 Jul 2020 21:55:07 -0300

To: David Bremner, notmuch@notmuchmail.org

Cc:

From: David Bremner

Falling out of the catch meant the error return was lost
---
 lib/directory.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/directory.cc b/lib/directory.cc
index 044cd680..37973c09 100644
--- a/lib/directory.cc
+++ b/lib/directory.cc
@@ -308,7 +308,7 @@ notmuch_directory_get_child_directories (notmuch_directory_t *directory)
 notmuch_status_t
 notmuch_directory_delete (notmuch_directory_t *directory)
 {
-    notmuch_status_t status;
+    notmuch_status_t status = NOTMUCH_STATUS_SUCCESS;
     Xapian::WritableDatabase *db;
 
     status = _notmuch_database_ensure_writable (directory->notmuch);
@@ -327,7 +327,7 @@ notmuch_directory_delete (notmuch_directory_t *directory)
     }
     notmuch_directory_destroy (directory);
 
-    return NOTMUCH_STATUS_SUCCESS;
+    return status;
 }
 
 void
-- 
2.27.0
_______________________________________________
notmuch mailing list -- notmuch@notmuchmail.org
To unsubscribe send an email to notmuch-leave@notmuchmail.org

Thread: