From 516e196fa12a71982ee4feb4ef6ff52f48b1805b Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sun, 27 Sep 2015 12:31:59 -0300 Subject: [PATCH 1/1] ruby: use new count API This change of replacing ignoring errors with exceptions is intended, and indeed one of the main motivations for the libnotmuch API changes. --- bindings/ruby/query.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/bindings/ruby/query.c b/bindings/ruby/query.c index a7dacba3..f87700a4 100644 --- a/bindings/ruby/query.c +++ b/bindings/ruby/query.c @@ -173,14 +173,16 @@ VALUE notmuch_rb_query_count_messages (VALUE self) { notmuch_query_t *query; + notmuch_status_t status; + unsigned int count; Data_Get_Notmuch_Query (self, query); - /* Xapian exceptions are not handled properly. - * (function may return 0 after printing a message) - * Thus there is nothing we can do here... - */ - return UINT2NUM(notmuch_query_count_messages(query)); + status = notmuch_query_count_messages_st (query, &count); + if (status) + notmuch_rb_status_raise (status); + + return UINT2NUM(count); } /* @@ -192,12 +194,14 @@ VALUE notmuch_rb_query_count_threads (VALUE self) { notmuch_query_t *query; + notmuch_status_t status; + unsigned int count; Data_Get_Notmuch_Query (self, query); - /* Xapian exceptions are not handled properly. - * (function may return 0 after printing a message) - * Thus there is nothing we can do here... - */ - return UINT2NUM(notmuch_query_count_threads(query)); + status = notmuch_query_count_threads_st (query, &count); + if (status) + notmuch_rb_status_raise (status); + + return UINT2NUM(count); } -- 2.43.0