unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / code / Atom feed
From: Felipe Contreras <felipe.contreras@gmail.com>
To: notmuch@notmuchmail.org
Cc: David Bremner <david@tethera.net>,
	Felipe Contreras <felipe.contreras@gmail.com>
Subject: [PATCH v2] ruby: cleanup object_destroy()
Date: Tue,  3 Aug 2021 13:44:57 -0500	[thread overview]
Message-ID: <20210803184457.6807-1-felipe.contreras@gmail.com> (raw)
In-Reply-To: <87fsvrzrml.fsf@tethera.net>

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

  reply	other threads:[~2021-08-03 18:45 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-07  3:45 [PATCH 0/2] ruby: sync database close/destroy Felipe Contreras
2021-07-07  3:45 ` [PATCH 1/2] ruby: split database close and destroy Felipe Contreras
2021-07-07  3:45 ` [PATCH 2/2] ruby: cleanup object_destroy() Felipe Contreras
2021-08-02 17:24 ` [PATCH 0/2] ruby: sync database close/destroy David Bremner
2021-08-03 18:44   ` Felipe Contreras [this message]
2021-08-04  1:46     ` [PATCH v2] ruby: cleanup object_destroy() David Bremner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://notmuchmail.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210803184457.6807-1-felipe.contreras@gmail.com \
    --to=felipe.contreras@gmail.com \
    --cc=david@tethera.net \
    --cc=notmuch@notmuchmail.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://yhetil.org/notmuch.git/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).