lib/query: Drop the first and max_messages arguments from search_messages.

These only existed to support the chunky-searching hack, but that
was recently dropped anyway.

diff --git a/lib/notmuch.h b/lib/notmuch.h
index 9b40fb69a9e58ff1d984b6d738a8189e5183eaae..8bba442f62b3505a8c68d7b6a03a388daca44a7c 100644 (file)
--- a/lib/notmuch.h
+++ b/lib/notmuch.h
@@ -361,14 +361,6 @@ notmuch_query_search_threads (notmuch_query_t *query);
  * messages object is owned by the query and as such, will only be
  * valid until notmuch_query_destroy.
  *
- * The 'first' and 'max_messages' arguments can be used to obtain
- * partial results from the search. For example, to get results 10 at
- * a time, pass 'max_messages' as 10 and for 'first' pass the values
- * 0, 10, 20, etc. As a special case, a value of -1 for 'max_messages'
- * indicates that no limiting is to be performed. So a search with
- * 'first' == 0 and 'max_messages' == -1 will return the complete
- * results of the search.
- *
  * Typical usage might be:
  *
  *     notmuch_query_t *query;
@@ -401,8 +393,7 @@ notmuch_query_search_threads (notmuch_query_t *query);
  * reason to call it if the query is about to be destroyed).
  */
 notmuch_messages_t *
-notmuch_query_search_messages (notmuch_query_t *query,
-                              int first, int max_messages);
+notmuch_query_search_messages (notmuch_query_t *query);
 
 /* Destroy a notmuch_query_t along with any associated resources.
  *

diff --git a/lib/query.cc b/lib/query.cc
index 504ab9e6b5463436a048102435992d328a74f7de..7d191e529ec72974a2ec5adad21fe63e87e2942f 100644 (file)
--- a/lib/query.cc
+++ b/lib/query.cc
@@ -76,9 +76,7 @@ notmuch_query_set_sort (notmuch_query_t *query, notmuch_sort_t sort)
 }
 
 notmuch_messages_t *
-notmuch_query_search_messages (notmuch_query_t *query,
-                              int first,
-                              int max_messages)
+notmuch_query_search_messages (notmuch_query_t *query)
 {
     notmuch_database_t *notmuch = query->notmuch;
     const char *query_string = query->query_string;
@@ -130,9 +128,7 @@ notmuch_query_search_messages (notmuch_query_t *query,
 
        enquire.set_query (final_query);
 
-       if (max_messages == -1)
-           max_messages = notmuch->xapian_db->get_doccount ();
-       mset = enquire.get_mset (first, max_messages);
+       mset = enquire.get_mset (0, notmuch->xapian_db->get_doccount ());
 
        for (i = mset.begin (); i != mset.end (); i++) {
            notmuch_message_t *message;
@@ -186,7 +182,7 @@ notmuch_query_search_threads (notmuch_query_t *query)
     threads->threads = g_hash_table_new_full (g_str_hash, g_str_equal,
                                              free, NULL);
 
-    threads->messages = notmuch_query_search_messages (query, 0, -1);
+    threads->messages = notmuch_query_search_messages (query);
 
     threads->thread_id = NULL;
 

diff --git a/lib/thread.cc b/lib/thread.cc
index 267f4dbaa2bd15a315b6444911483c0b82293503..58d88c2d1597145276a83807165d6939ab340bd2 100644 (file)
--- a/lib/thread.cc
+++ b/lib/thread.cc
@@ -260,7 +260,7 @@ _notmuch_thread_create (void *ctx,
 
     notmuch_query_set_sort (thread_id_query, NOTMUCH_SORT_OLDEST_FIRST);
 
-    for (messages = notmuch_query_search_messages (thread_id_query, 0, -1);
+    for (messages = notmuch_query_search_messages (thread_id_query);
         notmuch_messages_has_more (messages);
         notmuch_messages_advance (messages))
     {
@@ -271,7 +271,7 @@ _notmuch_thread_create (void *ctx,
 
     notmuch_query_destroy (thread_id_query);
 
-    for (messages = notmuch_query_search_messages (matched_query, 0, -1);
+    for (messages = notmuch_query_search_messages (matched_query);
         notmuch_messages_has_more (messages);
         notmuch_messages_advance (messages))
     {

diff --git a/notmuch-dump.c b/notmuch-dump.c
index fc06f3f9a5625581432a4d3956b6cdcc8da411ec..ea326bb672efb89a27ab33c62235c5a7f51ea008 100644 (file)
--- a/notmuch-dump.c
+++ b/notmuch-dump.c
@@ -58,7 +58,7 @@ notmuch_dump_command (unused (void *ctx), int argc, char *argv[])
        output = stdout;
     }
 
-    for (messages = notmuch_query_search_messages (query, 0, -1);
+    for (messages = notmuch_query_search_messages (query);
         notmuch_messages_has_more (messages);
         notmuch_messages_advance (messages))
     {

diff --git a/notmuch-reply.c b/notmuch-reply.c
index cd81e769aee7b3d6d30b41ff777a3954644f45a0..65bd356403e210c76b000a6aa6b632d298f81d78 100644 (file)
--- a/notmuch-reply.c
+++ b/notmuch-reply.c
@@ -234,7 +234,7 @@ notmuch_reply_command (void *ctx, int argc, char *argv[])
        return 1;
     }
 
-    for (messages = notmuch_query_search_messages (query, 0, -1);
+    for (messages = notmuch_query_search_messages (query);
         notmuch_messages_has_more (messages);
         notmuch_messages_advance (messages))
     {

diff --git a/notmuch-tag.c b/notmuch-tag.c
index e2311f61584ebb47557589cd50477ae483b612c3..07cb8c5f21b53df36452b3fc14415b63f2f0b075 100644 (file)
--- a/notmuch-tag.c
+++ b/notmuch-tag.c
@@ -105,7 +105,7 @@ notmuch_tag_command (void *ctx, unused (int argc), unused (char *argv[]))
        return 1;
     }
 
-    for (messages = notmuch_query_search_messages (query, 0, -1);
+    for (messages = notmuch_query_search_messages (query);
         notmuch_messages_has_more (messages) && !interrupted;
         notmuch_messages_advance (messages))
     {