Merge branch 'debian/unstable' into release

[notmuch] / notmuch-reindex.c

diff --git a/notmuch-reindex.c b/notmuch-reindex.c
index 5d702510ae2965d36325222274c46aae6ba3aa67..3139a8c665a0fb46bb6626a77c32f26c4ff5c60a 100644 (file)
--- a/notmuch-reindex.c
+++ b/notmuch-reindex.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
  */
@@ -71,6 +71,7 @@ reindex_query (notmuch_database_t *notmuch, const char *query_string,
        ret = notmuch_message_reindex(message, indexopts);
        if (ret != NOTMUCH_STATUS_SUCCESS)
            break;
+       notmuch_message_destroy (message);
     }
 
     if (!ret)
@@ -116,7 +117,7 @@ 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));