From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id 2112F6DE20F6 for ; Sun, 26 Feb 2017 13:22:03 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: -0.005 X-Spam-Level: X-Spam-Status: No, score=-0.005 tagged_above=-999 required=5 tests=[AWL=0.006, SPF_PASS=-0.001, T_RP_MATCHES_RCVD=-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 AaUA1Londf_Y for ; Sun, 26 Feb 2017 13:22:02 -0800 (PST) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by arlo.cworth.org (Postfix) with ESMTPS id 0C77A6DE2157 for ; Sun, 26 Feb 2017 13:22:02 -0800 (PST) Received: from remotemail by fethera.tethera.net with local (Exim 4.84_2) (envelope-from ) id 1ci6Fv-0000ra-4Q; Sun, 26 Feb 2017 16:21:23 -0500 Received: (nullmailer pid 6585 invoked by uid 1000); Sun, 26 Feb 2017 21:21:57 -0000 From: David Bremner To: David Bremner , notmuch@notmuchmail.org Subject: [PATCH 6/6] lib: replace deprecated n_q_count_threads with status returning version Date: Sun, 26 Feb 2017 17:21:35 -0400 Message-Id: <20170226212135.4119-7-david@tethera.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170226212135.4119-1-david@tethera.net> References: <20170223014656.9500-1-david@tethera.net> <20170226212135.4119-1-david@tethera.net> X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.22 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, 26 Feb 2017 21:22:03 -0000 This function was deprecated in notmuch 0.21. We re-use the name for a status returning version, and deprecate the _st name. --- bindings/python/notmuch/query.py | 2 +- bindings/ruby/query.c | 2 +- lib/notmuch.h | 16 +++++++--------- lib/query.cc | 12 ++++-------- notmuch-count.c | 2 +- notmuch-search.c | 2 +- 6 files changed, 15 insertions(+), 21 deletions(-) diff --git a/bindings/python/notmuch/query.py b/bindings/python/notmuch/query.py index 10fb6dcc..06c7b11b 100644 --- a/bindings/python/notmuch/query.py +++ b/bindings/python/notmuch/query.py @@ -204,7 +204,7 @@ class Query(object): raise NotmuchError(status) return count.value - _count_threads = nmlib.notmuch_query_count_threads_st + _count_threads = nmlib.notmuch_query_count_threads _count_threads.argtypes = [NotmuchQueryP, POINTER(c_uint)] _count_threads.restype = c_uint diff --git a/bindings/ruby/query.c b/bindings/ruby/query.c index b6edaef3..8b46d700 100644 --- a/bindings/ruby/query.c +++ b/bindings/ruby/query.c @@ -201,7 +201,7 @@ notmuch_rb_query_count_threads (VALUE self) Data_Get_Notmuch_Query (self, query); - status = notmuch_query_count_threads_st (query, &count); + status = notmuch_query_count_threads (query, &count); if (status) notmuch_rb_status_raise (status); diff --git a/lib/notmuch.h b/lib/notmuch.h index b79618f6..e692e9bb 100644 --- a/lib/notmuch.h +++ b/lib/notmuch.h @@ -1044,22 +1044,20 @@ notmuch_query_count_messages_st (notmuch_query_t *query, unsigned int *count); * NOTMUCH_STATUS_XAPIAN_EXCEPTION: a Xapian exception occured. The * value of *count is not defined. * - * @since libnotmuch 4.3 (notmuch 0.21) + * @since libnotmuch 5 (notmuch 0.25) */ notmuch_status_t -notmuch_query_count_threads_st (notmuch_query_t *query, unsigned *count); +notmuch_query_count_threads (notmuch_query_t *query, unsigned *count); /** - * like notmuch_query_count_threads, but without a status return. - * - * May return 0 in case of errors. + * Deprecated alias for notmuch_query_count_threads * - * @deprecated Deprecated as of libnotmuch 4.3 (notmuch 0.21). Please + * @deprecated Deprecated as of libnotmuch 5.0 (notmuch 0.25). Please * use notmuch_query_count_threads_st instead. */ -NOTMUCH_DEPRECATED(4,3) -unsigned int -notmuch_query_count_threads (notmuch_query_t *query); +NOTMUCH_DEPRECATED(5,0) +notmuch_status_t +notmuch_query_count_threads_st (notmuch_query_t *query, unsigned *count); /** * Get the thread ID of 'thread'. diff --git a/lib/query.cc b/lib/query.cc index 25b953c7..6c692e8e 100644 --- a/lib/query.cc +++ b/lib/query.cc @@ -612,18 +612,14 @@ _notmuch_query_count_documents (notmuch_query_t *query, const char *type, unsign return NOTMUCH_STATUS_SUCCESS; } -unsigned -notmuch_query_count_threads (notmuch_query_t *query) +notmuch_status_t +notmuch_query_count_threads_st (notmuch_query_t *query, unsigned *count) { - notmuch_status_t status; - unsigned int count; - - status = notmuch_query_count_threads_st (query, &count); - return status ? 0 : count; + return notmuch_query_count_threads (query, count); } notmuch_status_t -notmuch_query_count_threads_st (notmuch_query_t *query, unsigned *count) +notmuch_query_count_threads (notmuch_query_t *query, unsigned *count) { notmuch_messages_t *messages; GHashTable *hash; diff --git a/notmuch-count.c b/notmuch-count.c index 493be30f..cf80ee25 100644 --- a/notmuch-count.c +++ b/notmuch-count.c @@ -98,7 +98,7 @@ print_count (notmuch_database_t *notmuch, const char *query_str, printf ("%u", ucount); break; case OUTPUT_THREADS: - status = notmuch_query_count_threads_st (query, &ucount); + status = notmuch_query_count_threads (query, &ucount); if (print_status_query ("notmuch count", query, status)) return -1; printf ("%u", ucount); diff --git a/notmuch-search.c b/notmuch-search.c index 71218fdd..30722e86 100644 --- a/notmuch-search.c +++ b/notmuch-search.c @@ -123,7 +123,7 @@ do_search_threads (search_context_t *ctx) if (ctx->offset < 0) { unsigned count; notmuch_status_t status; - status = notmuch_query_count_threads_st (ctx->query, &count); + status = notmuch_query_count_threads (ctx->query, &count); if (print_status_query ("notmuch search", ctx->query, status)) return 1; -- 2.11.0