debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-25 04:18:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib: replace deprecated n_q_count_threads with status returning version

Browse source 
This function was deprecated in notmuch 0.21.  We re-use the name for
a status returning version, and deprecate the _st name.
This commit is contained in:
David Bremner 2017-02-26 17:21:35 -04:00
parent 5ce8e0b11b
commit 3721bd45d7
6 changed files with 15 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bindings/python/notmuch/query.py
View file

@ -204,7 +204,7 @@ class Query(object):
raise NotmuchError(status) raise NotmuchError(status)
return count.value 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.argtypes = [NotmuchQueryP, POINTER(c_uint)]
_count_threads.restype = c_uint _count_threads.restype = c_uint

2
bindings/ruby/query.c
View file

@ -201,7 +201,7 @@ notmuch_rb_query_count_threads (VALUE self)
Data_Get_Notmuch_Query (self, query); Data_Get_Notmuch_Query (self, query);
status = notmuch_query_count_threads_st (query, &count); status = notmuch_query_count_threads (query, &count);
if (status) if (status)
notmuch_rb_status_raise (status); notmuch_rb_status_raise (status);

16
lib/notmuch.h
View file

@ -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 * NOTMUCH_STATUS_XAPIAN_EXCEPTION: a Xapian exception occured. The
* value of *count is not defined. * value of *count is not defined.
* *
* @since libnotmuch 4.3 (notmuch 0.21) * @since libnotmuch 5 (notmuch 0.25)
*/ */
notmuch_status_t 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. * Deprecated alias for notmuch_query_count_threads
* *
* May return 0 in case of errors. * @deprecated Deprecated as of libnotmuch 5.0 (notmuch 0.25). Please
*
* @deprecated Deprecated as of libnotmuch 4.3 (notmuch 0.21). Please
* use notmuch_query_count_threads_st instead. * use notmuch_query_count_threads_st instead.
*/ */
NOTMUCH_DEPRECATED(4,3) NOTMUCH_DEPRECATED(5,0)
unsigned int notmuch_status_t
notmuch_query_count_threads (notmuch_query_t *query); notmuch_query_count_threads_st (notmuch_query_t *query, unsigned *count);
/** /**
* Get the thread ID of 'thread'. * Get the thread ID of 'thread'.

12
lib/query.cc
View file

@ -680,18 +680,14 @@ _notmuch_query_count_documents (notmuch_query_t *query, const char *type, unsign
return NOTMUCH_STATUS_SUCCESS; return NOTMUCH_STATUS_SUCCESS;
} }
unsigned notmuch_status_t
notmuch_query_count_threads (notmuch_query_t *query) notmuch_query_count_threads_st (notmuch_query_t *query, unsigned *count)
{ {
notmuch_status_t status; return notmuch_query_count_threads (query, count);
unsigned int count;
status = notmuch_query_count_threads_st (query, &count);
return status ? 0 : count;
} }
notmuch_status_t 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; notmuch_messages_t *messages;
GHashTable *hash; GHashTable *hash;

2
notmuch-count.c
View file

@ -98,7 +98,7 @@ print_count (notmuch_database_t *notmuch, const char *query_str,
printf ("%u", ucount); printf ("%u", ucount);
break; break;
case OUTPUT_THREADS: 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)) if (print_status_query ("notmuch count", query, status))
return -1; return -1;
printf ("%u", ucount); printf ("%u", ucount);

2
notmuch-search.c
View file

@ -123,7 +123,7 @@ do_search_threads (search_context_t *ctx)
if (ctx->offset < 0) { if (ctx->offset < 0) {
unsigned count; unsigned count;
notmuch_status_t status; 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)) if (print_status_query ("notmuch search", ctx->query, status))
return 1; return 1;