lib: Treat NULL as a valid (and empty) notmuch_filenames_t iterator.

[notmuch] / lib / database.cc

diff --git a/lib/database.cc b/lib/database.cc
index 510d13cbcd8ff09972164603b8adfe32495af4e5..dc967c8c8ae62b65e25168747468a68d46c14d0e 100644 (file)
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -199,7 +199,7 @@ notmuch_status_to_string (notmuch_status_t status)
     case NOTMUCH_STATUS_OUT_OF_MEMORY:
        return "Out of memory";
     case NOTMUCH_STATUS_READONLY_DATABASE:
-       return "The database is read-only";
+       return "Attempt to write to a read-only database";
     case NOTMUCH_STATUS_XAPIAN_EXCEPTION:
        return "A Xapian exception occurred";
     case NOTMUCH_STATUS_FILE_ERROR:
@@ -1201,14 +1201,16 @@ notmuch_database_remove_message (notmuch_database_t *notmuch,
            strncmp ((*j).c_str (), prefix, strlen (prefix)))
        {
            db->delete_document (document.get_docid ());
+           status = NOTMUCH_STATUS_SUCCESS;
        } else {
            db->replace_document (document.get_docid (), document);
+           status = NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID;
        }
     }
 
     talloc_free (local);
 
-    return NOTMUCH_STATUS_SUCCESS;
+    return status;
 }
 
 notmuch_tags_t *