From 2474bce8b1a5b8011b19d8ff5cc84957e71e1917 Mon Sep 17 00:00:00 2001 From: Felipe Contreras Date: Tue, 3 Aug 2021 13:44:57 -0500 Subject: [PATCH] ruby: cleanup object_destroy() 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 --- 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 */