[PATCH] notmuch-deliver: Update to new notmuch_database_open API

[PATCH] notmuch-deliver: Update to new notmuch_database_open API

[Austin Clements]

Commit 5fddc07 changed this API, but missed this use of it.
---
 contrib/notmuch-deliver/src/main.c |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/contrib/notmuch-deliver/src/main.c b/contrib/notmuch-deliver/src/main.c
index 37d2919..032b9d6 100644
--- a/contrib/notmuch-deliver/src/main.c
+++ b/contrib/notmuch-deliver/src/main.c
@@ -359,6 +359,7 @@ main(int argc, char **argv)
 	GOptionContext *ctx;
 	GError *error = NULL;
 	notmuch_database_t *db;
+	notmuch_status_t status;
 
 	ctx = g_option_context_new("[FOLDER]");
 	g_option_context_add_main_entries(ctx, options, PACKAGE);
@@ -429,7 +430,14 @@ main(int argc, char **argv)
 		maildir = g_strdup(db_path);
 
 	g_debug("Opening notmuch database `%s'", db_path);
-	db = notmuch_database_open(db_path, NOTMUCH_DATABASE_MODE_READ_WRITE);
+	status = notmuch_database_open(db_path, NOTMUCH_DATABASE_MODE_READ_WRITE,
+				       &db);
+	if (status) {
+	    g_critical("Failed to open database `%s': %s",
+		       db_path, notmuch_status_to_string(status));
+	    g_free(maildir);
+	    return EX_SOFTWARE;
+	}
 	g_free(db_path);
 	if (db == NULL)
 		return EX_SOFTWARE;
-- 
1.7.10

Re: [PATCH] notmuch-deliver: Update to new notmuch_database_open API

[David Bremner]

Austin Clements <amdragon@MIT.EDU> writes:

> Commit 5fddc07 changed this API, but missed this use of it.
> ---
>  contrib/notmuch-deliver/src/main.c |   10 +++++++++-
>  1 file changed, 9 insertions(+), 1 deletion(-)

Applies clean, notmuch-deliver builds. I have no easy way to test
notmuch-deliver, but this seems to be an improvement on the status quo,

I'm tempted to do another point release, with just this change.

Comments?

d