X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch.c;h=5ab155e51f930aad9ed789fd714c6a560b823aa2;hp=d98935bd4f73d2045f28466a9ac5156f40c21ac4;hb=1ba3d46f;hpb=884ac59256d19db5ee25d976a4f5e60cce51d7d5

diff --git a/notmuch.c b/notmuch.c
index d98935bd..5ab155e5 100644
--- a/notmuch.c
+++ b/notmuch.c
@@ -87,14 +87,14 @@ chomp_newline (char *str)
 }
 
 /* Compute the number of seconds elapsed from start to end. */
-double
+static double
 tv_elapsed (struct timeval start, struct timeval end)
 {
     return ((end.tv_sec - start.tv_sec) +
 	    (end.tv_usec - start.tv_usec) / 1e6);
 }
 
-void
+static void
 print_formatted_seconds (double seconds)
 {
     int hours;
@@ -120,7 +120,7 @@ print_formatted_seconds (double seconds)
     printf ("%ds", (int) seconds);
 }
 
-void
+static void
 add_files_print_progress (add_files_state_t *state)
 {
     struct timeval tv_now;
@@ -165,7 +165,7 @@ add_files_print_progress (add_files_state_t *state)
  * The 'struct stat *st' must point to a structure that has already
  * been initialized for 'path' by calling stat().
  */
-notmuch_status_t
+static notmuch_status_t
 add_files_recursive (notmuch_database_t *notmuch,
 		     const char *path,
 		     struct stat *st,
@@ -267,10 +267,16 @@ add_files_recursive (notmuch_database_t *notmuch,
 			break;
 		    /* Fatal issues. Don't process anymore. */
 		    case NOTMUCH_STATUS_XAPIAN_EXCEPTION:
-			fprintf (stderr, "A Xapian error was encountered. Halting processing.\n");
+		    case NOTMUCH_STATUS_OUT_OF_MEMORY:
+			fprintf (stderr, "Error: %s. Halting processing.\n",
+				 notmuch_status_to_string (status));
 			ret = status;
 			goto DONE;
 		    default:
+		    case NOTMUCH_STATUS_FILE_ERROR:
+		    case NOTMUCH_STATUS_NULL_POINTER:
+		    case NOTMUCH_STATUS_TAG_TOO_LONG:
+		    case NOTMUCH_STATUS_LAST_STATUS:
 			INTERNAL_ERROR ("add_message returned unexpected value: %d",  status);
 			goto DONE;
 		}
@@ -332,7 +338,7 @@ add_files (notmuch_database_t *notmuch,
  * of path.  The result is added to *count (which should be
  * initialized to zero by the top-level caller before calling
  * count_files). */
-void
+static void
 count_files (const char *path, int *count)
 {
     DIR *dir;
@@ -400,7 +406,7 @@ count_files (const char *path, int *count)
     closedir (dir);
 }
 
-int
+static int
 setup_command (unused (int argc), unused (char *argv[]))
 {
     notmuch_database_t *notmuch = NULL;
@@ -526,7 +532,7 @@ setup_command (unused (int argc), unused (char *argv[]))
     return ret;
 }
 
-int
+static int
 new_command (unused (int argc), unused (char *argv[]))
 {
     notmuch_database_t *notmuch;
@@ -596,15 +602,14 @@ new_command (unused (int argc), unused (char *argv[]))
     return ret;
 }
 
-int
+static int
 search_command (int argc, char *argv[])
 {
     void *local = talloc_new (NULL);
     notmuch_database_t *notmuch = NULL;
     notmuch_query_t *query;
-    notmuch_results_t *results;
-    notmuch_message_t *message;
-    notmuch_tags_t *tags;
+    notmuch_thread_results_t *results;
+    notmuch_thread_t *thread;
     char *query_str;
     int i;
     notmuch_status_t ret = NOTMUCH_STATUS_SUCCESS;
@@ -632,30 +637,15 @@ search_command (int argc, char *argv[])
 	goto DONE;
     }
 
-    for (results = notmuch_query_search (query);
-	 notmuch_results_has_more (results);
-	 notmuch_results_advance (results))
+    for (results = notmuch_query_search_threads (query);
+	 notmuch_thread_results_has_more (results);
+	 notmuch_thread_results_advance (results))
     {
-	int first = 1;
-	message = notmuch_results_get (results);
+	thread = notmuch_thread_results_get (results);
 
-	printf ("%s (", notmuch_message_get_message_id (message));
+	printf ("%s\n", notmuch_thread_get_thread_id (thread));
 
-	for (tags = notmuch_message_get_tags (message);
-	     notmuch_tags_has_more (tags);
-	     notmuch_tags_advance (tags))
-	{
-	    if (! first)
-		printf (" ");
-
-	    printf ("%s", notmuch_tags_get (tags));
-
-	    first = 0;
-	}
-
-	printf (")\n");
-
-	notmuch_message_destroy (message);
+	notmuch_thread_destroy (thread);
     }
 
     notmuch_query_destroy (query);
@@ -668,20 +658,20 @@ search_command (int argc, char *argv[])
     return ret;
 }
 
-int
+static int
 show_command (unused (int argc), unused (char *argv[]))
 {
     fprintf (stderr, "Error: show is not implemented yet.\n");
     return 1;
 }
 
-int
+static int
 dump_command (int argc, char *argv[])
 {
     FILE *output;
     notmuch_database_t *notmuch = NULL;
     notmuch_query_t *query;
-    notmuch_results_t *results;
+    notmuch_message_results_t *results;
     notmuch_message_t *message;
     notmuch_tags_t *tags;
     int ret = 0;
@@ -713,12 +703,12 @@ dump_command (int argc, char *argv[])
 
     notmuch_query_set_sort (query, NOTMUCH_SORT_MESSAGE_ID);
 
-    for (results = notmuch_query_search (query);
-	 notmuch_results_has_more (results);
-	 notmuch_results_advance (results))
+    for (results = notmuch_query_search_messages (query);
+	 notmuch_message_results_has_more (results);
+	 notmuch_message_results_advance (results))
     {
 	int first = 1;
-	message = notmuch_results_get (results);
+	message = notmuch_message_results_get (results);
 
 	fprintf (output,
 		 "%s (", notmuch_message_get_message_id (message));
@@ -751,7 +741,7 @@ dump_command (int argc, char *argv[])
     return ret;
 }
 
-int
+static int
 restore_command (int argc, char *argv[])
 {
     FILE *input;
@@ -892,7 +882,7 @@ command_t commands[] = {
       "\t\tRestore the tags from the given dump file (see 'dump')." }
 };
 
-void
+static void
 usage (void)
 {
     command_t *command;