X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-search.c;h=4e3514b686467ef3d719ad8a79fc546ed3acd90b;hp=482c6e8ea8c061d7865728c857a30f1dfe31497a;hb=bb5211684654b7cf54f842990a733a64fe01d612;hpb=6ce2bf68f53fec4302121763e588c33c7cd86a9c

diff --git a/notmuch-search.c b/notmuch-search.c
index 482c6e8e..4e3514b6 100644
--- a/notmuch-search.c
+++ b/notmuch-search.c
@@ -24,7 +24,7 @@ typedef struct search_format {
     const char *results_start;
     const char *thread_start;
     void (*thread) (const void *ctx,
-		    const char *id,
+		    const char *thread_id,
 		    const time_t date,
 		    const int matched,
 		    const int total,
@@ -41,7 +41,7 @@ typedef struct search_format {
 
 static void
 format_thread_text (const void *ctx,
-		    const char *id,
+		    const char *thread_id,
 		    const time_t date,
 		    const int matched,
 		    const int total,
@@ -60,7 +60,7 @@ static const search_format_t format_text = {
 
 static void
 format_thread_json (const void *ctx,
-		    const char *id,
+		    const char *thread_id,
 		    const time_t date,
 		    const int matched,
 		    const int total,
@@ -79,7 +79,7 @@ static const search_format_t format_json = {
 
 static void
 format_thread_text (const void *ctx,
-		    const char *id,
+		    const char *thread_id,
 		    const time_t date,
 		    const int matched,
 		    const int total,
@@ -87,7 +87,7 @@ format_thread_text (const void *ctx,
 		    const char *subject)
 {
     printf ("thread:%s %12s [%d/%d] %s; %s",
-	    id,
+	    thread_id,
 	    notmuch_time_relative_date (ctx, date),
 	    matched,
 	    total,
@@ -97,7 +97,7 @@ format_thread_text (const void *ctx,
 
 static void
 format_thread_json (const void *ctx,
-		    const char *id,
+		    const char *thread_id,
 		    const time_t date,
 		    const int matched,
 		    const int total,
@@ -110,18 +110,18 @@ format_thread_json (const void *ctx,
 
     tm = gmtime (&date);
     if (tm == NULL)
-	INTERNAL_ERROR ("gmtime failed on thread %s.", id);
+	INTERNAL_ERROR ("gmtime failed on thread %s.", thread_id);
 
     if (strftime (timestamp, sizeof (timestamp), "%s", tm) == 0)
-	INTERNAL_ERROR ("strftime failed on thread %s.", id);
+	INTERNAL_ERROR ("strftime failed on thread %s.", thread_id);
 
-    printf ("\"id\": %s,\n"
+    printf ("\"thread\": %s,\n"
 	    "\"timestamp\": %s,\n"
 	    "\"matched\": %d,\n"
 	    "\"total\": %d,\n"
 	    "\"authors\": %s,\n"
 	    "\"subject\": %s,\n",
-	    json_quote_str (ctx_quote, id),
+	    json_quote_str (ctx_quote, thread_id),
 	    timestamp,
 	    matched,
 	    total,
@@ -146,8 +146,8 @@ do_search_threads (const void *ctx,
     fputs (format->results_start, stdout);
 
     for (threads = notmuch_query_search_threads (query);
-	 notmuch_threads_has_more (threads);
-	 notmuch_threads_advance (threads))
+	 notmuch_threads_valid (threads);
+	 notmuch_threads_move_to_next (threads))
     {
 	int first_tag = 1;
 
@@ -174,8 +174,8 @@ do_search_threads (const void *ctx,
 	fputs (format->tag_start, stdout);
 
 	for (tags = notmuch_thread_get_tags (thread);
-	     notmuch_tags_has_more (tags);
-	     notmuch_tags_advance (tags))
+	     notmuch_tags_valid (tags);
+	     notmuch_tags_move_to_next (tags))
 	{
 	    if (! first_tag)
 		fputs (format->tag_sep, stdout);