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 04/10] ruby: simplify data get helper
Date: Tue, 4 May 2021 03:17:43 -0500 [thread overview]
Message-ID: <20210504081749.715768-5-felipe.contreras@gmail.com> (raw)
In-Reply-To: <20210504081749.715768-1-felipe.contreras@gmail.com>
The type is not actually needed.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
bindings/ruby/defs.h | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/bindings/ruby/defs.h b/bindings/ruby/defs.h
index 46e2caf8..8fb47b4c 100644
--- a/bindings/ruby/defs.h
+++ b/bindings/ruby/defs.h
@@ -55,39 +55,39 @@ extern ID ID_db_mode;
# define RSTRING_PTR(v) (RSTRING((v))->ptr)
#endif /* !defined (RSTRING_PTR) */
-#define Data_Get_Notmuch_Object(obj, type, message, ptr) \
+#define Data_Get_Notmuch_Object(obj, message, ptr) \
do { \
- Data_Get_Struct ((obj), type, (ptr)); \
+ (ptr) = rb_data_object_get ((obj)); \
if (!(ptr)) \
rb_raise (rb_eRuntimeError, (message)); \
} while (0)
#define Data_Get_Notmuch_Database(obj, ptr) \
- Data_Get_Notmuch_Object ((obj), notmuch_database_t, "database closed", (ptr))
+ Data_Get_Notmuch_Object ((obj), "database closed", (ptr))
#define Data_Get_Notmuch_Directory(obj, ptr) \
- Data_Get_Notmuch_Object ((obj), notmuch_directory_t, "directory destroyed", (ptr))
+ Data_Get_Notmuch_Object ((obj), "directory destroyed", (ptr))
#define Data_Get_Notmuch_FileNames(obj, ptr) \
- Data_Get_Notmuch_Object ((obj), notmuch_filenames_t, "filenames destroyed", (ptr))
+ Data_Get_Notmuch_Object ((obj), "filenames destroyed", (ptr))
#define Data_Get_Notmuch_Query(obj, ptr) \
- Data_Get_Notmuch_Object ((obj), notmuch_query_t, "query destroyed", (ptr))
+ Data_Get_Notmuch_Object ((obj), "query destroyed", (ptr))
#define Data_Get_Notmuch_Threads(obj, ptr) \
- Data_Get_Notmuch_Object ((obj), notmuch_threads_t, "threads destroyed", (ptr))
+ Data_Get_Notmuch_Object ((obj), "threads destroyed", (ptr))
#define Data_Get_Notmuch_Messages(obj, ptr) \
- Data_Get_Notmuch_Object ((obj), notmuch_messages_t, "messages destroyed", (ptr))
+ Data_Get_Notmuch_Object ((obj), "messages destroyed", (ptr))
#define Data_Get_Notmuch_Thread(obj, ptr) \
- Data_Get_Notmuch_Object ((obj), notmuch_thread_t, "thread destroyed", (ptr))
+ Data_Get_Notmuch_Object ((obj), "thread destroyed", (ptr))
#define Data_Get_Notmuch_Message(obj, ptr) \
- Data_Get_Notmuch_Object ((obj), notmuch_message_t, "message destroyed", (ptr))
+ Data_Get_Notmuch_Object ((obj), "message destroyed", (ptr))
#define Data_Get_Notmuch_Tags(obj, ptr) \
- Data_Get_Notmuch_Object ((obj), notmuch_tags_t, "tags destroyed", (ptr))
+ Data_Get_Notmuch_Object ((obj), "tags destroyed", (ptr))
/* status.c */
void
--
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 ` Felipe Contreras [this message]
2021-05-12 21:59 ` [PATCH v2 04/10] ruby: simplify " 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 ` [PATCH v2 08/10] ruby: move towards more modern RTypedData Felipe Contreras
2021-05-12 22:02 ` 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-5-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).