X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=notmuch-search.c;h=704aa43b654ec7fa10aab5ac795a4d079a19d48f;hb=76f1c84e6f8caf8768e2bd10a4db2954703b19b9;hp=25c9cfccc3323634824f1749d3f420b296c368cc;hpb=e6e0cb942c24cff55778731ac53e1b737044f84a;p=notmuch

diff --git a/notmuch-search.c b/notmuch-search.c
index 25c9cfcc..704aa43b 100644
--- a/notmuch-search.c
+++ b/notmuch-search.c
@@ -104,8 +104,6 @@ format_thread_json (const void *ctx,
 		    const char *authors,
 		    const char *subject)
 {
-    struct tm *tm;
-    char timestamp[40];
     void *ctx_quote = talloc_new (ctx);
 
     printf ("\"thread\": %s,\n"
@@ -124,7 +122,7 @@ format_thread_json (const void *ctx,
     talloc_free (ctx_quote);
 }
 
-static void
+static int
 do_search_threads (const void *ctx,
 		   const search_format_t *format,
 		   notmuch_query_t *query,
@@ -138,7 +136,11 @@ do_search_threads (const void *ctx,
 
     fputs (format->results_start, stdout);
 
-    for (threads = notmuch_query_search_threads (query);
+    threads = notmuch_query_search_threads (query);
+    if (threads == NULL)
+	return 1;
+
+    for (;
 	 notmuch_threads_valid (threads);
 	 notmuch_threads_move_to_next (threads))
     {
@@ -185,6 +187,8 @@ do_search_threads (const void *ctx,
     }
 
     fputs (format->results_end, stdout);
+
+    return 0;
 }
 
 int
@@ -197,7 +201,7 @@ notmuch_search_command (void *ctx, int argc, char *argv[])
     char *opt;
     notmuch_sort_t sort = NOTMUCH_SORT_NEWEST_FIRST;
     const search_format_t *format = &format_text;
-    int i;
+    int i, ret;
 
     for (i = 0; i < argc && argv[i][0] == '-'; i++) {
 	if (strcmp (argv[i], "--") == 0) {
@@ -260,10 +264,10 @@ notmuch_search_command (void *ctx, int argc, char *argv[])
 
     notmuch_query_set_sort (query, sort);
 
-    do_search_threads (ctx, format, query, sort);
+    ret = do_search_threads (ctx, format, query, sort);
 
     notmuch_query_destroy (query);
     notmuch_database_close (notmuch);
 
-    return 0;
+    return ret;
 }