ruby: split database close and destroy

Mirrors the C API: 7864350c (Split notmuch_database_close into two
functions, 2012-04-25).

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
This commit is contained in:
Felipe Contreras 2021-07-06 22:45:32 -05:00 committed by David Bremner
parent e8fa42a97a
commit 7415b53fa5
3 changed files with 22 additions and 1 deletions

View file

@ -26,6 +26,19 @@ notmuch_rb_database_alloc (VALUE klass)
return Data_Wrap_Notmuch_Object (klass, &notmuch_rb_database_type, NULL); return Data_Wrap_Notmuch_Object (klass, &notmuch_rb_database_type, NULL);
} }
/*
* call-seq: DB.destroy => nil
*
* Destroys the database, freeing all resources allocated for it.
*/
VALUE
notmuch_rb_database_destroy (VALUE self)
{
notmuch_rb_object_destroy (self, &notmuch_rb_database_type);
return Qnil;
}
/* /*
* call-seq: Notmuch::Database.new(path [, {:create => false, :mode => Notmuch::MODE_READ_ONLY}]) => DB * call-seq: Notmuch::Database.new(path [, {:create => false, :mode => Notmuch::MODE_READ_ONLY}]) => DB
* *
@ -113,8 +126,12 @@ notmuch_rb_database_open (int argc, VALUE *argv, VALUE klass)
VALUE VALUE
notmuch_rb_database_close (VALUE self) notmuch_rb_database_close (VALUE self)
{ {
notmuch_database_t *db;
notmuch_status_t ret; notmuch_status_t ret;
ret = notmuch_rb_object_destroy (self, &notmuch_rb_database_type);
Data_Get_Notmuch_Database (self, db);
ret = notmuch_database_close (db);
notmuch_rb_status_raise (ret); notmuch_rb_status_raise (ret);
return Qnil; return Qnil;

View file

@ -160,6 +160,9 @@ notmuch_rb_status_raise (notmuch_status_t status);
VALUE VALUE
notmuch_rb_database_alloc (VALUE klass); notmuch_rb_database_alloc (VALUE klass);
VALUE
notmuch_rb_database_destroy (VALUE self);
VALUE VALUE
notmuch_rb_database_initialize (int argc, VALUE *argv, VALUE klass); notmuch_rb_database_initialize (int argc, VALUE *argv, VALUE klass);

View file

@ -266,6 +266,7 @@ Init_notmuch (void)
rb_define_alloc_func (notmuch_rb_cDatabase, notmuch_rb_database_alloc); rb_define_alloc_func (notmuch_rb_cDatabase, notmuch_rb_database_alloc);
rb_define_singleton_method (notmuch_rb_cDatabase, "open", notmuch_rb_database_open, -1); /* in database.c */ rb_define_singleton_method (notmuch_rb_cDatabase, "open", notmuch_rb_database_open, -1); /* in database.c */
rb_define_method (notmuch_rb_cDatabase, "initialize", notmuch_rb_database_initialize, -1); /* in database.c */ rb_define_method (notmuch_rb_cDatabase, "initialize", notmuch_rb_database_initialize, -1); /* in database.c */
rb_define_method (notmuch_rb_cDatabase, "destroy!", notmuch_rb_database_destroy, 0); /* in database.c */
rb_define_method (notmuch_rb_cDatabase, "close", notmuch_rb_database_close, 0); /* in database.c */ rb_define_method (notmuch_rb_cDatabase, "close", notmuch_rb_database_close, 0); /* in database.c */
rb_define_method (notmuch_rb_cDatabase, "path", notmuch_rb_database_path, 0); /* in database.c */ rb_define_method (notmuch_rb_cDatabase, "path", notmuch_rb_database_path, 0); /* in database.c */
rb_define_method (notmuch_rb_cDatabase, "version", notmuch_rb_database_version, 0); /* in database.c */ rb_define_method (notmuch_rb_cDatabase, "version", notmuch_rb_database_version, 0); /* in database.c */