It was assumed the destructor of notmuch_rb_database_type did return a
notmuch_status_t because that's what notmuch_database_close returns, and
that value was checked by notmuch_rb_database_close in order to decide
if to raise an exception.

It turns out notmuch_database_destroy was called instead, so nothing was
returned (void).

All the destroy functions are void, and that's what we want.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---

Rebased on top of latest master.

 bindings/ruby/defs.h | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/bindings/ruby/defs.h b/bindings/ruby/defs.h
index a33ef0da..e2541e8f 100644
--- a/bindings/ruby/defs.h
+++ b/bindings/ruby/defs.h
@@ -136,20 +136,17 @@ notmuch_rb_object_free (void *rb_wrapper)
     talloc_free (rb_wrapper);
 }
 
-static inline notmuch_status_t
+static inline void
 notmuch_rb_object_destroy (VALUE rb_object, const rb_data_type_t *type)
 {
     notmuch_rb_object_t *rb_wrapper;
-    notmuch_status_t ret;
 
     Data_Get_Notmuch_Rb_Object (rb_object, type, rb_wrapper);
 
     /* Call the corresponding notmuch_*_destroy function */
-    ret = ((notmuch_status_t (*)(void *)) type->data) (rb_wrapper->nm_object);
+    ((void (*)(void *)) type->data) (rb_wrapper->nm_object);
     notmuch_rb_object_free (rb_wrapper);
     DATA_PTR (rb_object) = NULL;
-
-    return ret;
 }
 
 /* status.c */
-- 
2.32.0.40.gb9b36f9b52
_______________________________________________
notmuch mailing list -- notmuch@notmuchmail.org
To unsubscribe send an email to notmuch-leave@notmuchmail.org