From: David Bremner <david@tethera.net>
Date: Sun, 27 Sep 2015 15:32:01 +0000 (-0300)
Subject: lib: migrate notmuch_database_upgrade to new query_search API
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2501c2565ccca19e3e49fa1594aaa90f04e37d6d;p=notmuch.git

lib: migrate notmuch_database_upgrade to new query_search API

Here we depend on the error path cleaning up query
---

diff --git a/lib/database.cc b/lib/database.cc
index f39d4485..5e86955d 100644
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -1450,9 +1450,10 @@ notmuch_database_upgrade (notmuch_database_t *notmuch,
 
 	query = notmuch_query_create (notmuch, "");
 
-	/* XXX: this should use the _st version, but needs an error
-	   path */
-	for (messages = notmuch_query_search_messages (query);
+	status = notmuch_query_search_messages_st (query, &messages);
+	if (status)
+	    goto DONE;
+	for (;
 	     notmuch_messages_valid (messages);
 	     notmuch_messages_move_to_next (messages))
 	{