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 7B0126DE2078 for ; Wed, 22 Feb 2017 17:47:07 -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 iiBo66AC4vfQ for ; Wed, 22 Feb 2017 17:47:07 -0800 (PST) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by arlo.cworth.org (Postfix) with ESMTPS id D2DD86DE2072 for ; Wed, 22 Feb 2017 17:47:06 -0800 (PST) Received: from remotemail by fethera.tethera.net with local (Exim 4.84_2) (envelope-from ) id 1cgiUG-0003Cb-HD; Wed, 22 Feb 2017 20:46:28 -0500 Received: (nullmailer pid 9542 invoked by uid 1000); Thu, 23 Feb 2017 01:47:04 -0000 From: David Bremner To: notmuch@notmuchmail.org Subject: [PATCH] lib: remove notmuch_query_{count,search}_{threads,messages} Date: Wed, 22 Feb 2017 21:46:56 -0400 Message-Id: <20170223014656.9500-1-david@tethera.net> X-Mailer: git-send-email 2.11.0 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: Thu, 23 Feb 2017 01:47:07 -0000 These 4 functions were originally deprecated in notmuch 0.21, more than a year ago. --- lib/notmuch.h | 50 -------------------------------------------------- test/T560-lib-error.sh | 4 ++-- 2 files changed, 2 insertions(+), 52 deletions(-) diff --git a/lib/notmuch.h b/lib/notmuch.h index 16da8be9..5c9f5137 100644 --- a/lib/notmuch.h +++ b/lib/notmuch.h @@ -862,19 +862,6 @@ notmuch_query_search_threads_st (notmuch_query_t *query, notmuch_threads_t **out); /** - * Like notmuch_query_search_threads_st, but without a status return. - * - * If a Xapian exception occurs this function will return NULL. - * - * @deprecated Deprecated as of libnotmuch 4.3 (notmuch 0.21). Please - * use notmuch_query_search_threads_st instead. - * - */ -NOTMUCH_DEPRECATED(4,3) -notmuch_threads_t * -notmuch_query_search_threads (notmuch_query_t *query); - -/** * Execute a query for messages, returning a notmuch_messages_t object * which can be used to iterate over the results. The returned * messages object is owned by the query and as such, will only be @@ -919,19 +906,6 @@ notmuch_status_t notmuch_query_search_messages_st (notmuch_query_t *query, notmuch_messages_t **out); /** - * Like notmuch_query_search_messages, but without a status return. - * - * If a Xapian exception occurs this function will return NULL. - * - * @deprecated Deprecated as of libnotmuch 4.3 (notmuch 0.21). Please use - * notmuch_query_search_messages_st instead. - * - */ -NOTMUCH_DEPRECATED(4,3) -notmuch_messages_t * -notmuch_query_search_messages (notmuch_query_t *query); - -/** * Destroy a notmuch_query_t along with any associated resources. * * This will in turn destroy any notmuch_threads_t and @@ -1016,18 +990,6 @@ notmuch_status_t notmuch_query_count_messages_st (notmuch_query_t *query, unsigned int *count); /** - * like notmuch_query_count_messages_st, but without a status return. - * - * May return 0 in the case of errors. - * - * @deprecated Deprecated since libnotmuch 4.3 (notmuch 0.21). Please - * use notmuch_query_count_messages_st instead. - */ -NOTMUCH_DEPRECATED(4,3) -unsigned int -notmuch_query_count_messages (notmuch_query_t *query); - -/** * Return the number of threads matching a search. * * This function performs a search and returns the number of unique thread IDs @@ -1053,18 +1015,6 @@ notmuch_status_t notmuch_query_count_threads_st (notmuch_query_t *query, unsigned *count); /** - * like notmuch_query_count_threads, but without a status return. - * - * May return 0 in case of errors. - * - * @deprecated Deprecated as of libnotmuch 4.3 (notmuch 0.21). Please - * use notmuch_query_count_threads_st instead. - */ -NOTMUCH_DEPRECATED(4,3) -unsigned int -notmuch_query_count_threads (notmuch_query_t *query); - -/** * Get the thread ID of 'thread'. * * The returned string belongs to 'thread' and as such, should not be diff --git a/test/T560-lib-error.sh b/test/T560-lib-error.sh index 087c6bd7..a59eb74d 100755 --- a/test/T560-lib-error.sh +++ b/test/T560-lib-error.sh @@ -302,9 +302,9 @@ backup_database test_begin_subtest "Xapian exception counting messages" cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR} { + int count; notmuch_query_t *query=notmuch_query_create (db, "id:87ocn0qh6d.fsf@yoom.home.cworth.org"); - int count = notmuch_query_count_messages (query); - stat = (count == 0); + stat = notmuch_query_count_messages_st (query, &count); } EOF sed 's/^\(A Xapian exception [^:]*\):.*$/\1/' < OUTPUT > OUTPUT.clean -- 2.11.0