From 5c00af46ec5add69b3b2750ea2a9437e5953a7b0 Mon Sep 17 00:00:00 2001 From: Ali Polatel Date: Tue, 4 Oct 2011 16:57:33 +0300 Subject: [PATCH] ruby: Fix macros, use quoting Fix Data_Get_Notmuch_* macro definitions broken by prev. commit Adequate quoting for Data_Get_Notmuch_* macros Remove duplicated RSTRING_PTR() macros, move it to defs.h --- bindings/ruby/database.c | 28 -------------- bindings/ruby/defs.h | 83 +++++++++++++++++++++------------------- bindings/ruby/message.c | 12 ------ 3 files changed, 44 insertions(+), 79 deletions(-) diff --git a/bindings/ruby/database.c b/bindings/ruby/database.c index b75dfd18..982fd592 100644 --- a/bindings/ruby/database.c +++ b/bindings/ruby/database.c @@ -43,10 +43,6 @@ notmuch_rb_database_initialize (int argc, VALUE *argv, VALUE self) VALUE pathv, hashv; VALUE modev; -#if !defined(RSTRING_PTR) -# define RSTRING_PTR(v) (RSTRING((v))->ptr) -#endif /* !defined(RSTRING_PTR) */ - /* Check arguments */ rb_scan_args (argc, argv, "11", &pathv, &hashv); @@ -255,10 +251,6 @@ notmuch_rb_database_get_directory (VALUE self, VALUE pathv) Data_Get_Notmuch_Database (self, db); -#if !defined(RSTRING_PTR) -# define RSTRING_PTR(v) (RSTRING((v))->ptr) -#endif /* !defined(RSTRING_PTR) */ - SafeStringValue (pathv); path = RSTRING_PTR (pathv); @@ -287,10 +279,6 @@ notmuch_rb_database_add_message (VALUE self, VALUE pathv) Data_Get_Notmuch_Database (self, db); -#if !defined(RSTRING_PTR) -# define RSTRING_PTR(v) (RSTRING((v))->ptr) -#endif /* !defined(RSTRING_PTR) */ - SafeStringValue (pathv); path = RSTRING_PTR (pathv); @@ -317,10 +305,6 @@ notmuch_rb_database_remove_message (VALUE self, VALUE pathv) Data_Get_Notmuch_Database (self, db); -#if !defined(RSTRING_PTR) -# define RSTRING_PTR(v) (RSTRING((v))->ptr) -#endif /* !defined (RSTRING_PTR) */ - SafeStringValue (pathv); path = RSTRING_PTR (pathv); @@ -344,10 +328,6 @@ notmuch_rb_database_find_message (VALUE self, VALUE idv) Data_Get_Notmuch_Database (self, db); -#if !defined(RSTRING_PTR) -# define RSTRING_PTR(v) (RSTRING((v))->ptr) -#endif /* !defined (RSTRING_PTR) */ - SafeStringValue (idv); id = RSTRING_PTR (idv); @@ -374,10 +354,6 @@ notmuch_rb_database_find_message_by_filename (VALUE self, VALUE pathv) Data_Get_Notmuch_Database (self, db); -#if !defined(RSTRING_PTR) -# define RSTRING_PTR(v) (RSTRING((v))->ptr) -#endif /* !defined (RSTRING_PTR) */ - SafeStringValue (pathv); path = RSTRING_PTR (pathv); @@ -403,10 +379,6 @@ notmuch_rb_database_query_create (VALUE self, VALUE qstrv) Data_Get_Notmuch_Database (self, db); -#if !defined(RSTRING_PTR) -# define RSTRING_PTR(v) (RSTRING((v))->ptr) -#endif /* !defined (RSTRING_PTR) */ - SafeStringValue (qstrv); qstr = RSTRING_PTR (qstrv); diff --git a/bindings/ruby/defs.h b/bindings/ruby/defs.h index 308a2073..81f652fb 100644 --- a/bindings/ruby/defs.h +++ b/bindings/ruby/defs.h @@ -50,76 +50,81 @@ ID ID_call; ID ID_db_create; ID ID_db_mode; -#define Data_Get_Notmuch_Database (obj, ptr) \ - do { \ - Check_Type (obj, T_DATA); \ - if (DATA_PTR (obj) == NULL) \ - rb_raise (rb_eRuntimeError, "database closed"); \ - Data_Get_Struct (obj, notmuch_database_t, ptr); \ +/* RSTRING_PTR() is new in ruby-1.9 */ +#if !defined(RSTRING_PTR) +# define RSTRING_PTR(v) (RSTRING((v))->ptr) +#endif /* !defined (RSTRING_PTR) */ + +#define Data_Get_Notmuch_Database(obj, ptr) \ + do { \ + Check_Type ((obj), T_DATA); \ + if (DATA_PTR ((obj)) == NULL) \ + rb_raise (rb_eRuntimeError, "database closed"); \ + Data_Get_Struct ((obj), notmuch_database_t, (ptr)); \ } while (0) -#define Data_Get_Notmuch_Directory (obj, ptr) \ +#define Data_Get_Notmuch_Directory(obj, ptr) \ do { \ - Check_Type (obj, T_DATA); \ - if (DATA_PTR (obj) == NULL) \ + Check_Type ((obj), T_DATA); \ + if (DATA_PTR ((obj)) == NULL) \ rb_raise (rb_eRuntimeError, "directory destroyed"); \ - Data_Get_Struct (obj, notmuch_directory_t, ptr); \ + Data_Get_Struct ((obj), notmuch_directory_t, (ptr)); \ } while (0) -#define Data_Get_Notmuch_FileNames (obj, ptr) \ +#define Data_Get_Notmuch_FileNames(obj, ptr) \ do { \ - Check_Type (obj, T_DATA); \ - if (DATA_PTR (obj) == NULL) \ + Check_Type ((obj), T_DATA); \ + if (DATA_PTR ((obj)) == NULL) \ rb_raise (rb_eRuntimeError, "filenames destroyed"); \ - Data_Get_Struct (obj, notmuch_filenames_t, ptr); \ + Data_Get_Struct ((obj), notmuch_filenames_t, (ptr)); \ } while (0) -#define Data_Get_Notmuch_Query (obj, ptr) \ +#define Data_Get_Notmuch_Query(obj, ptr) \ do { \ - Check_Type (obj, T_DATA); \ - if (DATA_PTR (obj) == NULL) \ - rb_raise (rb_eRuntimeError, "query destroyed"); \ - Data_Get_Struct (obj, notmuch_query_t, ptr); \ + Check_Type ((obj), T_DATA); \ + if (DATA_PTR ((obj)) == NULL) \ + rb_raise (rb_eRuntimeError, "query destroyed"); \ + Data_Get_Struct ((obj), notmuch_query_t, (ptr)); \ } while (0) -#define Data_Get_Notmuch_Threads (obj, ptr) \ +#define Data_Get_Notmuch_Threads(obj, ptr) \ do { \ - Check_Type (obj, T_DATA); \ - if (DATA_PTR (obj) == NULL) \ + Check_Type ((obj), T_DATA); \ + if (DATA_PTR ((obj)) == NULL) \ rb_raise (rb_eRuntimeError, "threads destroyed"); \ - Data_Get_Struct (obj, notmuch_threads_t, ptr); \ + Data_Get_Struct ((obj), notmuch_threads_t, (ptr)); \ } while (0) -#define Data_Get_Notmuch_Messages (obj, ptr) \ +#define Data_Get_Notmuch_Messages(obj, ptr) \ do { \ - Check_Type (obj, T_DATA); \ - if (DATA_PTR (obj) == NULL) \ + Check_Type ((obj), T_DATA); \ + if (DATA_PTR ((obj)) == NULL) \ rb_raise (rb_eRuntimeError, "messages destroyed"); \ - Data_Get_Struct (obj, notmuch_messages_t, ptr); \ + Data_Get_Struct ((obj), notmuch_messages_t, (ptr)); \ } while (0) -#define Data_Get_Notmuch_Thread (obj, ptr) \ +#define Data_Get_Notmuch_Thread(obj, ptr) \ do { \ - Check_Type (obj, T_DATA); \ - if (DATA_PTR (obj) == NULL) \ + Check_Type ((obj), T_DATA); \ + if (DATA_PTR ((obj)) == NULL) \ rb_raise (rb_eRuntimeError, "thread destroyed"); \ - Data_Get_Struct (obj, notmuch_thread_t, ptr); \ + Data_Get_Struct ((obj), notmuch_thread_t, (ptr)); \ } while (0) -#define Data_Get_Notmuch_Message (obj, ptr) \ +#define Data_Get_Notmuch_Message(obj, ptr) \ do { \ - Check_Type (obj, T_DATA); \ - if (DATA_PTR (obj) == NULL) \ + Check_Type ((obj), T_DATA); \ + if (DATA_PTR ((obj)) == NULL) \ rb_raise (rb_eRuntimeError, "message destroyed"); \ - Data_Get_Struct (obj, notmuch_message_t, ptr); \ + Data_Get_Struct ((obj), notmuch_message_t, (ptr)); \ } while (0) -#define Data_Get_Notmuch_Tags (obj, ptr) \ +#define Data_Get_Notmuch_Tags(obj, ptr) \ do { \ - Check_Type (obj, T_DATA); \ - if (DATA_PTR (obj) == NULL) \ + Check_Type ((obj), T_DATA); \ + if (DATA_PTR ((obj)) == NULL) \ rb_raise (rb_eRuntimeError, "tags destroyed"); \ - Data_Get_Struct (obj, notmuch_tags_t, ptr); \ + Data_Get_Struct ((obj), notmuch_tags_t, (ptr)); \ } while (0) /* status.c */ diff --git a/bindings/ruby/message.c b/bindings/ruby/message.c index cadc841f..eed4b31b 100644 --- a/bindings/ruby/message.c +++ b/bindings/ruby/message.c @@ -194,10 +194,6 @@ notmuch_rb_message_get_header (VALUE self, VALUE headerv) Data_Get_Notmuch_Message (self, message); -#if !defined(RSTRING_PTR) -#define RSTRING_PTR(v) (RSTRING((v))->ptr) -#endif /* !defined(RSTRING_PTR) */ - SafeStringValue (headerv); header = RSTRING_PTR (headerv); @@ -242,10 +238,6 @@ notmuch_rb_message_add_tag (VALUE self, VALUE tagv) Data_Get_Notmuch_Message (self, message); -#if !defined(RSTRING_PTR) -#define RSTRING_PTR(v) (RSTRING((v))->ptr) -#endif /* !defined(RSTRING_PTR) */ - SafeStringValue (tagv); tag = RSTRING_PTR (tagv); @@ -269,10 +261,6 @@ notmuch_rb_message_remove_tag (VALUE self, VALUE tagv) Data_Get_Notmuch_Message (self, message); -#if !defined(RSTRING_PTR) -#define RSTRING_PTR(v) (RSTRING((v))->ptr) -#endif /* !defined(RSTRING_PTR) */ - SafeStringValue (tagv); tag = RSTRING_PTR (tagv); -- 2.26.2