MIME-Version: 1.0
In-Reply-To:
 <1335096477-27537-6-git-send-email-4winter@informatik.uni-hamburg.de>
References: <20120422120620.26225.40778@thinkbox.jade-hamburg.de>
	<1335096477-27537-1-git-send-email-4winter@informatik.uni-hamburg.de>
	<1335096477-27537-6-git-send-email-4winter@informatik.uni-hamburg.de>
Date: Mon, 23 Apr 2012 15:36:33 +0300
Message-ID:
 <CAMP44s0KHJz6AxUfRjEUk5heOEFVyT2NixpFNb5GZakXaoLAKw@mail.gmail.com>
Subject: Re: [PATCH 6/7] ruby: Use notmuch_database_destroy instead of
	notmuch_database_close
From: Felipe Contreras <felipe.contreras@gmail.com>
To: Justus Winter <4winter@informatik.uni-hamburg.de>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Cc: notmuch@notmuchmail.org
Precedence: list

Hi,

On Sun, Apr 22, 2012 at 3:07 PM, Justus Winter
<4winter@informatik.uni-hamburg.de> wrote:
> Adapt the ruby bindings to the notmuch_database_close split.
>
> Signed-off-by: Justus Winter <4winter@informatik.uni-hamburg.de>
> ---
> =C2=A0bindings/ruby/database.c | =C2=A0 =C2=A02 +-
> =C2=A01 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/bindings/ruby/database.c b/bindings/ruby/database.c
> index 982fd59..ba9a139 100644
> --- a/bindings/ruby/database.c
> +++ b/bindings/ruby/database.c
> @@ -110,7 +110,7 @@ notmuch_rb_database_close (VALUE self)
> =C2=A0 =C2=A0 notmuch_database_t *db;
>
> =C2=A0 =C2=A0 Data_Get_Notmuch_Database (self, db);
> - =C2=A0 =C2=A0notmuch_database_close (db);
> + =C2=A0 =C2=A0notmuch_database_destroy (db);
> =C2=A0 =C2=A0 DATA_PTR (self) =3D NULL;
>
> =C2=A0 =C2=A0 return Qnil;
> --

I don't think this is the right approach. If database_destroy truly
destroys the object, then we would want to do it only at garbage
collection, when it's not accessible any more. What if I want to
re-use the database from the Ruby code?

This would probably be better:

-- a/bindings/ruby/database.c
+++ b/bindings/ruby/database.c
@@ -20,10 +20,16 @@

 #include "defs.h"

+static void
+database_free (void *p)
+{
+    notmuch_database_destroy (p);
+}
+
 VALUE
 notmuch_rb_database_alloc (VALUE klass)
 {
-    return Data_Wrap_Struct (klass, NULL, NULL, NULL);
+    return Data_Wrap_Struct (klass, NULL, database_free, NULL);
 }

 /*

--=20
Felipe Contreras