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.
This commit is contained in:
David Bremner 2015-09-27 12:31:59 -03:00
parent e7b420a854
commit 516e196fa1

View file

@ -173,14 +173,16 @@ VALUE
notmuch_rb_query_count_messages (VALUE self) notmuch_rb_query_count_messages (VALUE self)
{ {
notmuch_query_t *query; notmuch_query_t *query;
notmuch_status_t status;
unsigned int count;
Data_Get_Notmuch_Query (self, query); Data_Get_Notmuch_Query (self, query);
/* Xapian exceptions are not handled properly. status = notmuch_query_count_messages_st (query, &count);
* (function may return 0 after printing a message) if (status)
* Thus there is nothing we can do here... notmuch_rb_status_raise (status);
*/
return UINT2NUM(notmuch_query_count_messages(query)); return UINT2NUM(count);
} }
/* /*
@ -192,12 +194,14 @@ VALUE
notmuch_rb_query_count_threads (VALUE self) notmuch_rb_query_count_threads (VALUE self)
{ {
notmuch_query_t *query; notmuch_query_t *query;
notmuch_status_t status;
unsigned int count;
Data_Get_Notmuch_Query (self, query); Data_Get_Notmuch_Query (self, query);
/* Xapian exceptions are not handled properly. status = notmuch_query_count_threads_st (query, &count);
* (function may return 0 after printing a message) if (status)
* Thus there is nothing we can do here... notmuch_rb_status_raise (status);
*/
return UINT2NUM(notmuch_query_count_threads(query)); return UINT2NUM(count);
} }