X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-search.c;h=8b901210ddaab31a4cacd4c4f1a883b80ecb4c8a;hp=c628b369b66fadd975821261b4169e91c78ac3ca;hb=fda6416745b51450b6aa41dcd0d72df843fd3292;hpb=fb4ded1cc9de716b0e8d8b6dacce2417a9c421cb

diff --git a/notmuch-search.c b/notmuch-search.c
index c628b369..8b901210 100644
--- a/notmuch-search.c
+++ b/notmuch-search.c
@@ -72,7 +72,7 @@ static const search_format_t format_text = {
 		"%s", " ",
 	    ")", "\n",
 	"",
-    "\n",
+    "",
 };
 
 static void
@@ -167,8 +167,7 @@ format_thread_json (const void *ctx,
 }
 
 static int
-do_search_threads (const void *ctx,
-		   const search_format_t *format,
+do_search_threads (const search_format_t *format,
 		   notmuch_query_t *query,
 		   notmuch_sort_t sort,
 		   output_t output)
@@ -183,21 +182,21 @@ do_search_threads (const void *ctx,
     if (threads == NULL)
 	return 1;
 
+    fputs (format->results_start, stdout);
+
     for (;
 	 notmuch_threads_valid (threads);
 	 notmuch_threads_move_to_next (threads))
     {
 	int first_tag = 1;
 
-	if (first_thread)
-	    fputs (format->results_start, stdout);
-	else
+	if (! first_thread)
 	    fputs (format->item_sep, stdout);
 
 	thread = notmuch_threads_get (threads);
 
 	if (output == OUTPUT_THREADS) {
-	    format->item_id (ctx, "thread:",
+	    format->item_id (thread, "thread:",
 			     notmuch_thread_get_thread_id (thread));
 	} else { /* output == OUTPUT_SUMMARY */
 	    fputs (format->item_start, stdout);
@@ -207,7 +206,7 @@ do_search_threads (const void *ctx,
 	    else
 		date = notmuch_thread_get_newest_date (thread);
 
-	    format->thread_summary (ctx,
+	    format->thread_summary (thread,
 				    notmuch_thread_get_thread_id (thread),
 				    date,
 				    notmuch_thread_get_matched_messages (thread),
@@ -237,15 +236,13 @@ do_search_threads (const void *ctx,
 	notmuch_thread_destroy (thread);
     }
 
-    if (! first_thread)
-	fputs (format->results_end, stdout);
+    fputs (format->results_end, stdout);
 
     return 0;
 }
 
 static int
-do_search_messages (const void *ctx,
-		    const search_format_t *format,
+do_search_messages (const search_format_t *format,
 		    notmuch_query_t *query,
 		    output_t output)
 {
@@ -257,22 +254,22 @@ do_search_messages (const void *ctx,
     if (messages == NULL)
 	return 1;
 
+    fputs (format->results_start, stdout);
+
     for (;
 	 notmuch_messages_valid (messages);
 	 notmuch_messages_move_to_next (messages))
     {
 	message = notmuch_messages_get (messages);
 
-	if (first_message)
-	    fputs (format->results_start, stdout);
-	else
+	if (! first_message)
 	    fputs (format->item_sep, stdout);
 
 	if (output == OUTPUT_FILES) {
-	    format->item_id (ctx, "",
+	    format->item_id (message, "",
 			     notmuch_message_get_filename (message));
 	} else { /* output == OUTPUT_MESSAGES */
-	    format->item_id (ctx, "id:",
+	    format->item_id (message, "id:",
 			     notmuch_message_get_message_id (message));
 	}
 
@@ -283,15 +280,13 @@ do_search_messages (const void *ctx,
 
     notmuch_messages_destroy (messages);
 
-    if (! first_message)
-	fputs (format->results_end, stdout);
+    fputs (format->results_end, stdout);
 
     return 0;
 }
 
 static int
-do_search_tags (const void *ctx,
-		notmuch_database_t *notmuch,
+do_search_tags (notmuch_database_t *notmuch,
 		const search_format_t *format,
 		notmuch_query_t *query)
 {
@@ -313,18 +308,18 @@ do_search_tags (const void *ctx,
     if (tags == NULL)
 	return 1;
 
+    fputs (format->results_start, stdout);
+
     for (;
 	 notmuch_tags_valid (tags);
 	 notmuch_tags_move_to_next (tags))
     {
 	tag = notmuch_tags_get (tags);
 
-	if (first_tag)
-	    fputs (format->results_start, stdout);
-	else
+	if (! first_tag)
 	    fputs (format->item_sep, stdout);
 
-	format->item_id (ctx, "", tag);
+	format->item_id (tags, "", tag);
 
 	first_tag = 0;
     }
@@ -334,8 +329,7 @@ do_search_tags (const void *ctx,
     if (messages)
 	notmuch_messages_destroy (messages);
 
-    if (! first_tag)
-	fputs (format->results_end, stdout);
+    fputs (format->results_end, stdout);
 
     return 0;
 }
@@ -412,7 +406,7 @@ notmuch_search_command (void *ctx, int argc, char *argv[])
     if (notmuch == NULL)
 	return 1;
 
-    query_str = query_string_from_args (ctx, argc, argv);
+    query_str = query_string_from_args (notmuch, argc, argv);
     if (query_str == NULL) {
 	fprintf (stderr, "Out of memory.\n");
 	return 1;
@@ -434,14 +428,14 @@ notmuch_search_command (void *ctx, int argc, char *argv[])
     default:
     case OUTPUT_SUMMARY:
     case OUTPUT_THREADS:
-	ret = do_search_threads (ctx, format, query, sort, output);
+	ret = do_search_threads (format, query, sort, output);
 	break;
     case OUTPUT_MESSAGES:
     case OUTPUT_FILES:
-	ret = do_search_messages (ctx, format, query, output);
+	ret = do_search_messages (format, query, output);
 	break;
     case OUTPUT_TAGS:
-	ret = do_search_tags (ctx, notmuch, format, query);
+	ret = do_search_tags (notmuch, format, query);
 	break;
     }