X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-reindex.c;h=5a39ade103de2f0fd6160639d2e56fa873784acd;hp=d8589120cae94ed4fa4efa1c3cfdda9520d5697d;hb=33382c2b5ba2537952a60ea378feff36961e4713;hpb=2f4beda434c59f9e2f5b7c32d26543bad7217ad4

diff --git a/notmuch-reindex.c b/notmuch-reindex.c
index d8589120..5a39ade1 100644
--- a/notmuch-reindex.c
+++ b/notmuch-reindex.c
@@ -68,12 +68,13 @@ reindex_query (notmuch_database_t *notmuch, const char *query_string,
 	 notmuch_messages_move_to_next (messages)) {
 	message = notmuch_messages_get (messages);
 
-	ret = notmuch_message_reindex(message, indexopts);
+	ret = notmuch_message_reindex (message, indexopts);
 	if (ret != NOTMUCH_STATUS_SUCCESS)
 	    break;
+	notmuch_message_destroy (message);
     }
 
-    if (!ret)
+    if (! ret)
 	ret = notmuch_database_end_atomic (notmuch);
 
     notmuch_query_destroy (query);
@@ -116,14 +117,14 @@ notmuch_reindex_command (notmuch_config_t *config, int argc, char *argv[])
 
     notmuch_exit_if_unmatched_db_uuid (notmuch);
 
-    status = notmuch_process_shared_indexing_options (notmuch, config);
+    status = notmuch_process_shared_indexing_options (notmuch);
     if (status != NOTMUCH_STATUS_SUCCESS) {
 	fprintf (stderr, "Error: Failed to process index options. (%s)\n",
 		 notmuch_status_to_string (status));
 	return EXIT_FAILURE;
     }
 
-    query_string = query_string_from_args (config, argc-opt_index, argv+opt_index);
+    query_string = query_string_from_args (config, argc - opt_index, argv + opt_index);
     if (query_string == NULL) {
 	fprintf (stderr, "Out of memory\n");
 	return EXIT_FAILURE;
@@ -133,7 +134,7 @@ notmuch_reindex_command (notmuch_config_t *config, int argc, char *argv[])
 	fprintf (stderr, "Error: notmuch reindex requires at least one search term.\n");
 	return EXIT_FAILURE;
     }
-    
+
     ret = reindex_query (notmuch, query_string, indexing_cli_choices.opts);
 
     notmuch_database_destroy (notmuch);