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