Use notmuch_database_destroy instead of notmuch_database_close

Adapt the notmuch binaries source to the notmuch_database_close split.

Signed-off-by: Justus Winter <4winter@informatik.uni-hamburg.de>
This commit is contained in:
Justus Winter 2012-04-22 14:07:53 +02:00 committed by David Bremner
parent 2b3e9ff467
commit 6f7469f547
8 changed files with 8 additions and 8 deletions

View file

@ -107,7 +107,7 @@ notmuch_count_command (void *ctx, int argc, char *argv[])
} }
notmuch_query_destroy (query); notmuch_query_destroy (query);
notmuch_database_close (notmuch); notmuch_database_destroy (notmuch);
return 0; return 0;
} }

View file

@ -116,7 +116,7 @@ notmuch_dump_command (unused (void *ctx), int argc, char *argv[])
fclose (output); fclose (output);
notmuch_query_destroy (query); notmuch_query_destroy (query);
notmuch_database_close (notmuch); notmuch_database_destroy (notmuch);
return 0; return 0;
} }

View file

@ -1041,7 +1041,7 @@ notmuch_new_command (void *ctx, int argc, char *argv[])
fprintf (stderr, "Note: A fatal error was encountered: %s\n", fprintf (stderr, "Note: A fatal error was encountered: %s\n",
notmuch_status_to_string (ret)); notmuch_status_to_string (ret));
notmuch_database_close (notmuch); notmuch_database_destroy (notmuch);
if (run_hooks && !ret && !interrupted) if (run_hooks && !ret && !interrupted)
ret = notmuch_run_hook (db_path, "post-new"); ret = notmuch_run_hook (db_path, "post-new");

View file

@ -755,7 +755,7 @@ notmuch_reply_command (void *ctx, int argc, char *argv[])
return 1; return 1;
notmuch_query_destroy (query); notmuch_query_destroy (query);
notmuch_database_close (notmuch); notmuch_database_destroy (notmuch);
if (params.cryptoctx) if (params.cryptoctx)
g_object_unref(params.cryptoctx); g_object_unref(params.cryptoctx);

View file

@ -192,7 +192,7 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[])
if (line) if (line)
free (line); free (line);
notmuch_database_close (notmuch); notmuch_database_destroy (notmuch);
if (input != stdin) if (input != stdin)
fclose (input); fclose (input);

View file

@ -545,7 +545,7 @@ notmuch_search_command (void *ctx, int argc, char *argv[])
} }
notmuch_query_destroy (query); notmuch_query_destroy (query);
notmuch_database_close (notmuch); notmuch_database_destroy (notmuch);
return ret; return ret;
} }

View file

@ -1117,7 +1117,7 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
} }
notmuch_query_destroy (query); notmuch_query_destroy (query);
notmuch_database_close (notmuch); notmuch_database_destroy (notmuch);
if (params.cryptoctx) if (params.cryptoctx)
g_object_unref(params.cryptoctx); g_object_unref(params.cryptoctx);

View file

@ -238,7 +238,7 @@ notmuch_tag_command (void *ctx, int argc, char *argv[])
ret = tag_query (ctx, notmuch, query_string, tag_ops, synchronize_flags); ret = tag_query (ctx, notmuch, query_string, tag_ops, synchronize_flags);
notmuch_database_close (notmuch); notmuch_database_destroy (notmuch);
return ret; return ret;
} }