Use notmuch_database_destroy instead of notmuch_database_close

[notmuch] / notmuch-new.c

diff --git a/notmuch-new.c b/notmuch-new.c
index bf9b120949b6697650a681eb5c566b0e97bbfccb..3ff630478c613848f342ddbdb42fa625484254d0 100644 (file)
--- a/notmuch-new.c
+++ b/notmuch-new.c
@@ -779,7 +779,8 @@ remove_filename (notmuch_database_t *notmuch,
        return status;
     status = notmuch_database_find_message_by_filename (notmuch, path, &message);
     if (status || message == NULL)
        return status;
     status = notmuch_database_find_message_by_filename (notmuch, path, &message);
     if (status || message == NULL)

-       return status;
+       goto DONE;
+

     status = notmuch_database_remove_message (notmuch, path);
     if (status == NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID) {
        add_files_state->renamed_messages++;
     status = notmuch_database_remove_message (notmuch, path);
     if (status == NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID) {
        add_files_state->renamed_messages++;


@@ -790,6 +791,8 @@ remove_filename (notmuch_database_t *notmuch,
        add_files_state->removed_messages++;
     }
     notmuch_message_destroy (message);
        add_files_state->removed_messages++;
     }
     notmuch_message_destroy (message);

+
+  DONE:

     notmuch_database_end_atomic (notmuch);
     return status;
 }
     notmuch_database_end_atomic (notmuch);
     return status;
 }


@@ -1038,7 +1041,7 @@ notmuch_new_command (void *ctx, int argc, char *argv[])
        fprintf (stderr, "Note: A fatal error was encountered: %s\n",
                 notmuch_status_to_string (ret));
 
        fprintf (stderr, "Note: A fatal error was encountered: %s\n",
                 notmuch_status_to_string (ret));
 

-    notmuch_database_close (notmuch);
+    notmuch_database_destroy (notmuch);

 
     if (run_hooks && !ret && !interrupted)
        ret = notmuch_run_hook (db_path, "post-new");
 
     if (run_hooks && !ret && !interrupted)
        ret = notmuch_run_hook (db_path, "post-new");