ruby: simplify data get helper

Data_Get_Struct is nothing but a macro that calls
rb_data_object_get with a cast (unnecessary in C).

        #define Data_Get_Struct(obj, type, sval) \
            ((sval) = RBIMPL_CAST((type*)rb_data_object_get(obj)))

We can use rb_data_object_get directly, and this way we don't need to
pass the type, which is unnecessary information.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
This commit is contained in:
Felipe Contreras 2021-05-15 16:20:57 -05:00 committed by David Bremner
parent c84ccb70f3
commit 78c059a24c

View file

@ -55,39 +55,39 @@ extern ID ID_db_mode;
# define RSTRING_PTR(v) (RSTRING((v))->ptr) # define RSTRING_PTR(v) (RSTRING((v))->ptr)
#endif /* !defined (RSTRING_PTR) */ #endif /* !defined (RSTRING_PTR) */
#define Data_Get_Notmuch_Object(obj, type, message, ptr) \ #define Data_Get_Notmuch_Object(obj, message, ptr) \
do { \ do { \
Data_Get_Struct ((obj), type, (ptr)); \ (ptr) = rb_data_object_get ((obj)); \
if (!(ptr)) \ if (!(ptr)) \
rb_raise (rb_eRuntimeError, (message)); \ rb_raise (rb_eRuntimeError, (message)); \
} while (0) } while (0)
#define Data_Get_Notmuch_Database(obj, ptr) \ #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) \ #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) \ #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) \ #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) \ #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) \ #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) \ #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) \ #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) \ #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 */ /* status.c */
void void