From: Felipe Contreras <felipe.contreras@gmail.com>
To: notmuch@notmuchmail.org
Cc: Ali Polatel <alip@exherbo.org>,
Austin Clements <amdragon@MIT.EDU>,
Tomi Ollila <tomi.ollila@iki.fi>,
Ludovic LANGE <ll-notmuchmail@lange.nom.fr>,
Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Subject: [PATCH v2 08/10] ruby: move towards more modern RTypedData
Date: Tue, 4 May 2021 03:17:47 -0500 [thread overview]
Message-ID: <20210504081749.715768-9-felipe.contreras@gmail.com> (raw)
In-Reply-To: <20210504081749.715768-1-felipe.contreras@gmail.com>
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
bindings/ruby/database.c | 2 +-
bindings/ruby/defs.h | 6 ++++--
bindings/ruby/init.c | 4 ++++
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/bindings/ruby/database.c b/bindings/ruby/database.c
index b9ad3373..bb4273e6 100644
--- a/bindings/ruby/database.c
+++ b/bindings/ruby/database.c
@@ -74,7 +74,7 @@ notmuch_rb_database_initialize (int argc, VALUE *argv, VALUE self)
mode = NOTMUCH_DATABASE_MODE_READ_ONLY;
}
- Check_Type (self, T_DATA);
+ rb_check_typeddata (self, ¬much_rb_object_type);
if (create)
ret = notmuch_database_create (path, &database);
else
diff --git a/bindings/ruby/defs.h b/bindings/ruby/defs.h
index fcf1ea39..6dbaa85d 100644
--- a/bindings/ruby/defs.h
+++ b/bindings/ruby/defs.h
@@ -55,9 +55,11 @@ extern ID ID_db_mode;
# define RSTRING_PTR(v) (RSTRING((v))->ptr)
#endif /* !defined (RSTRING_PTR) */
+extern const rb_data_type_t notmuch_rb_object_type;
+
#define Data_Get_Notmuch_Object(obj, ptr) \
do { \
- (ptr) = rb_data_object_get ((obj)); \
+ (ptr) = rb_check_typeddata ((obj), ¬much_rb_object_type); \
if (RB_UNLIKELY (!(ptr))) { \
VALUE cname = rb_class_name (CLASS_OF ((obj))); \
rb_raise (rb_eRuntimeError, "%"PRIsVALUE" object destroyed", cname); \
@@ -65,7 +67,7 @@ extern ID ID_db_mode;
} while (0)
#define Data_Wrap_Notmuch_Object(klass, ptr) \
- Data_Wrap_Struct ((klass), NULL, NULL, (ptr))
+ TypedData_Wrap_Struct ((klass), ¬much_rb_object_type, (ptr))
#define Data_Get_Notmuch_Database(obj, ptr) \
Data_Get_Notmuch_Object ((obj), (ptr))
diff --git a/bindings/ruby/init.c b/bindings/ruby/init.c
index 819fd1e3..f3b2e5b1 100644
--- a/bindings/ruby/init.c
+++ b/bindings/ruby/init.c
@@ -46,6 +46,10 @@ ID ID_call;
ID ID_db_create;
ID ID_db_mode;
+const rb_data_type_t notmuch_rb_object_type = {
+ .wrap_struct_name = "notmuch_object",
+};
+
/*
* Document-module: Notmuch
*
--
2.31.0
next prev parent reply other threads:[~2021-05-04 8:18 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-04 8:17 [PATCH v2 00/10] ruby: object cleanups Felipe Contreras
2021-05-04 8:17 ` [PATCH v2 01/10] ruby: add missing Data_Get_Notmuch helpers Felipe Contreras
2021-05-04 8:17 ` [PATCH v2 02/10] ruby: improve all Data_Get_Notmuch_* helpers Felipe Contreras
2021-05-04 8:17 ` [PATCH v2 03/10] ruby: improve general data get helper Felipe Contreras
2021-05-12 22:38 ` David Bremner
2021-05-04 8:17 ` [PATCH v2 04/10] ruby: simplify " Felipe Contreras
2021-05-12 21:59 ` David Bremner
2021-05-13 2:17 ` Felipe Contreras
2021-05-04 8:17 ` [PATCH v2 05/10] ruby: fetch class name in case of error Felipe Contreras
2021-05-04 8:17 ` [PATCH v2 06/10] ruby: add unlikely hint Felipe Contreras
2021-05-04 8:17 ` [PATCH v2 07/10] ruby: create Data_Wrap_Notmuch_Object helper Felipe Contreras
2021-05-04 8:17 ` Felipe Contreras [this message]
2021-05-12 22:02 ` [PATCH v2 08/10] ruby: move towards more modern RTypedData David Bremner
2021-05-13 2:23 ` Felipe Contreras
2021-05-04 8:17 ` [PATCH v2 09/10] ruby: add all data types Felipe Contreras
2021-05-04 8:17 ` [PATCH v2 10/10] ruby: new notmuch_rb_object_destroy() helper Felipe Contreras
2021-05-12 22:10 ` David Bremner
2021-05-13 2:31 ` Felipe Contreras
2021-05-04 8:25 ` [PATCH v2 00/10] ruby: object cleanups Felipe Contreras
2021-05-11 19:04 ` Felipe Contreras
2021-05-11 19:41 ` Tomi Ollila
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=20210504081749.715768-9-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=alip@exherbo.org \
--cc=amdragon@MIT.EDU \
--cc=dkg@fifthhorseman.net \
--cc=ll-notmuchmail@lange.nom.fr \
--cc=notmuch@notmuchmail.org \
--cc=tomi.ollila@iki.fi \
/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).