[PATCH 05/10] lib: note remaining uses of deprecated message search API

diff --git a/f6/8c8e734bb650ef32bed4d0b8bfbaad37b545d9 b/f6/8c8e734bb650ef32bed4d0b8bfbaad37b545d9
new file mode 100644 (file)
index 0000000..2d7e348
--- /dev/null
+++ b/f6/8c8e734bb650ef32bed4d0b8bfbaad37b545d9
@@ -0,0 +1,85 @@
+Return-Path: <bremner@tesseract.cs.unb.ca>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 487D96DE156A\r
+ for <notmuch@notmuchmail.org>; Sun,  7 Jun 2015 08:03:38 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.228\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.228 tagged_above=-999 required=5 tests=[AWL=0.218, \r
+ T_HEADER_FROM_DIFFERENT_DOMAINS=0.01] autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id tkd0ekHmbUXx for <notmuch@notmuchmail.org>;\r
+ Sun,  7 Jun 2015 08:03:36 -0700 (PDT)\r
+Received: from mx.xen14.node3324.gplhost.com (gitolite.debian.net\r
+ [87.98.215.224])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id 5E5166DE1512\r
+ for <notmuch@notmuchmail.org>; Sun,  7 Jun 2015 08:03:36 -0700 (PDT)\r
+Received: from remotemail by mx.xen14.node3324.gplhost.com with local (Exim\r
+ 4.80) (envelope-from <bremner@tesseract.cs.unb.ca>)\r
+ id 1Z1c64-0004oN-2g; Sun, 07 Jun 2015 15:02:48 +0000\r
+Received: (nullmailer pid 7858 invoked by uid 1000); Sun, 07 Jun 2015\r
+ 15:02:11 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 05/10] lib: note remaining uses of deprecated message search\r
+ API\r
+Date: Sun,  7 Jun 2015 17:01:58 +0200\r
+Message-Id: <1433689323-7520-6-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 2.1.4\r
+In-Reply-To: <1433689323-7520-1-git-send-email-david@tethera.net>\r
+References: <1433689323-7520-1-git-send-email-david@tethera.net>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.18\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch/>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sun, 07 Jun 2015 15:03:38 -0000\r
+\r
+The two remaining cases in the lib seem to require more than a simple\r
+replacement of the old call, with the new call plus a check of the\r
+return value.\r
+---\r
+ lib/database.cc | 2 ++\r
+ lib/thread.cc   | 2 ++\r
+ 2 files changed, 4 insertions(+)\r
+\r
+diff --git a/lib/database.cc b/lib/database.cc\r
+index 78a24f7..15619c3 100644\r
+--- a/lib/database.cc\r
++++ b/lib/database.cc\r
+@@ -1388,6 +1388,8 @@ notmuch_database_upgrade (notmuch_database_t *notmuch,\r
+       notmuch_message_t *message;\r
+       char *filename;\r
+ \r
++      /* XXX: this should use the _st version, but needs an error\r
++         path */\r
+       for (messages = notmuch_query_search_messages (query);\r
+            notmuch_messages_valid (messages);\r
+            notmuch_messages_move_to_next (messages))\r
+diff --git a/lib/thread.cc b/lib/thread.cc\r
+index 9847cf8..c8e58c3 100644\r
+--- a/lib/thread.cc\r
++++ b/lib/thread.cc\r
+@@ -504,6 +504,8 @@ _notmuch_thread_create (void *ctx,\r
+      * oldest or newest subject is desired. */\r
+     notmuch_query_set_sort (thread_id_query, NOTMUCH_SORT_OLDEST_FIRST);\r
+ \r
++    /* XXX: this should use the _st version, but it needs an error path\r
++     */\r
+     for (messages = notmuch_query_search_messages (thread_id_query);\r
+        notmuch_messages_valid (messages);\r
+        notmuch_messages_move_to_next (messages))\r
+-- \r
+2.1.4\r
+\r