From 7415b53fa568a3156ae3e3a47544a4784e024653 Mon Sep 17 00:00:00 2001 From: Felipe Contreras Date: Tue, 6 Jul 2021 22:45:32 -0500 Subject: [PATCH] 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 --- bindings/ruby/database.c | 19 ++++++++++++++++++- bindings/ruby/defs.h | 3 +++ bindings/ruby/init.c | 1 + 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/bindings/ruby/database.c b/bindings/ruby/database.c index 1cf4e4e2..9c3dbd96 100644 --- a/bindings/ruby/database.c +++ b/bindings/ruby/database.c @@ -26,6 +26,19 @@ notmuch_rb_database_alloc (VALUE klass) return Data_Wrap_Notmuch_Object (klass, ¬much_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, ¬much_rb_database_type); + + return Qnil; +} + /* * 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 notmuch_rb_database_close (VALUE self) { + notmuch_database_t *db; notmuch_status_t ret; - ret = notmuch_rb_object_destroy (self, ¬much_rb_database_type); + + Data_Get_Notmuch_Database (self, db); + + ret = notmuch_database_close (db); notmuch_rb_status_raise (ret); return Qnil; diff --git a/bindings/ruby/defs.h b/bindings/ruby/defs.h index 0f39f2d0..a33ef0da 100644 --- a/bindings/ruby/defs.h +++ b/bindings/ruby/defs.h @@ -160,6 +160,9 @@ notmuch_rb_status_raise (notmuch_status_t status); VALUE notmuch_rb_database_alloc (VALUE klass); +VALUE +notmuch_rb_database_destroy (VALUE self); + VALUE notmuch_rb_database_initialize (int argc, VALUE *argv, VALUE klass); diff --git a/bindings/ruby/init.c b/bindings/ruby/init.c index 55c5366e..cd9f04cd 100644 --- a/bindings/ruby/init.c +++ b/bindings/ruby/init.c @@ -266,6 +266,7 @@ Init_notmuch (void) 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_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, "path", notmuch_rb_database_path, 0); /* in database.c */ rb_define_method (notmuch_rb_cDatabase, "version", notmuch_rb_database_version, 0); /* in database.c */ -- 2.43.0