From 5c00af46ec5add69b3b2750ea2a9437e5953a7b0 Mon Sep 17 00:00:00 2001 From: Ali Polatel Date: Tue, 4 Oct 2011 16:57:33 +0300 Subject: 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 ---------------------------- 1 file changed, 28 deletions(-) (limited to 'bindings/ruby/database.c') 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); -- cgit v1.2.3