X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch.c;h=47969e1f542b6e6da612e586e2f23728ffe61cf4;hp=10782d4deadf9c2979a44c02541fdd351b298ca0;hb=cd467caf;hpb=cc48812cb55e046a77ce1b4aad33566acc5fbd47

diff --git a/notmuch.c b/notmuch.c
index 10782d4d..47969e1f 100644
--- a/notmuch.c
+++ b/notmuch.c
@@ -43,6 +43,8 @@
 
 #include <glib.h> /* g_strdup_printf */
 
+#define unused(x) x __attribute__ ((unused))
+
 /* There's no point in continuing when we've detected that we've done
  * something wrong internally (as opposed to the user passing in a
  * bogus value).
@@ -85,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;
@@ -118,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;
@@ -163,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,
@@ -265,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;
 		}
@@ -330,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;
@@ -398,8 +406,8 @@ count_files (const char *path, int *count)
     closedir (dir);
 }
 
-int
-setup_command (int argc, char *argv[])
+static int
+setup_command (unused (int argc), unused (char *argv[]))
 {
     notmuch_database_t *notmuch = NULL;
     char *default_path, *mail_directory = NULL;
@@ -524,8 +532,8 @@ setup_command (int argc, char *argv[])
     return ret;
 }
 
-int
-new_command (int argc, char *argv[])
+static int
+new_command (unused (int argc), unused (char *argv[]))
 {
     notmuch_database_t *notmuch;
     const char *mail_directory;
@@ -594,13 +602,13 @@ new_command (int argc, 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_results_t *results;
     notmuch_message_t *message;
     notmuch_tags_t *tags;
     char *query_str;
@@ -630,12 +638,12 @@ 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_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);
 
 	printf ("%s (", notmuch_message_get_message_id (message));
 
@@ -666,20 +674,20 @@ search_command (int argc, char *argv[])
     return ret;
 }
 
-int
-show_command (int argc, char *argv[])
+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;
@@ -711,12 +719,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));
@@ -749,7 +757,7 @@ dump_command (int argc, char *argv[])
     return ret;
 }
 
-int
+static int
 restore_command (int argc, char *argv[])
 {
     FILE *input;
@@ -890,7 +898,7 @@ command_t commands[] = {
       "\t\tRestore the tags from the given dump file (see 'dump')." }
 };
 
-void
+static void
 usage (void)
 {
     command_t *command;