ruby-changes:19079
From: akr <ko1@a...>
Date: Thu, 17 Mar 2011 06:23:38 +0900 (JST)
Subject: [ruby-changes:19079] Ruby:r31118 (trunk): * ext/openssl/ossl_x509name.c: parenthesize macro arguments.
akr 2011-03-17 06:23:31 +0900 (Thu, 17 Mar 2011) New Revision: 31118 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=31118 Log: * ext/openssl/ossl_x509name.c: parenthesize macro arguments. Modified files: trunk/ChangeLog trunk/ext/openssl/ossl_x509name.c Index: ChangeLog =================================================================== --- ChangeLog (revision 31117) +++ ChangeLog (revision 31118) @@ -1,3 +1,7 @@ +Wed Mar 16 08:40:39 2011 Tanaka Akira <akr@f...> + + * ext/openssl/ossl_x509name.c: parenthesize macro arguments. + Wed Mar 16 20:36:56 2011 Tanaka Akira <akr@f...> * ext/socket/ipsocket.c (init_inetsock_internal): raise an error on Index: ext/openssl/ossl_x509name.c =================================================================== --- ext/openssl/ossl_x509name.c (revision 31117) +++ ext/openssl/ossl_x509name.c (revision 31118) @@ -11,20 +11,20 @@ #include "ossl.h" #define WrapX509Name(klass, obj, name) do { \ - if (!name) { \ + if (!(name)) { \ ossl_raise(rb_eRuntimeError, "Name wasn't initialized."); \ } \ - obj = Data_Wrap_Struct(klass, 0, X509_NAME_free, name); \ + (obj) = Data_Wrap_Struct((klass), 0, X509_NAME_free, (name)); \ } while (0) #define GetX509Name(obj, name) do { \ - Data_Get_Struct(obj, X509_NAME, name); \ - if (!name) { \ + Data_Get_Struct((obj), X509_NAME, (name)); \ + if (!(name)) { \ ossl_raise(rb_eRuntimeError, "Name wasn't initialized."); \ } \ } while (0) #define SafeGetX509Name(obj, name) do { \ - OSSL_Check_Kind(obj, cX509Name); \ - GetX509Name(obj, name); \ + OSSL_Check_Kind((obj), cX509Name); \ + GetX509Name((obj), (name)); \ } while (0) #define OBJECT_TYPE_TEMPLATE \ @@ -89,7 +89,7 @@ static int id_aref; static VALUE ossl_x509name_add_entry(int, VALUE*, VALUE); -#define rb_aref(obj, key) rb_funcall(obj, id_aref, 1, key) +#define rb_aref(obj, key) rb_funcall((obj), id_aref, 1, (key)) static VALUE ossl_x509name_init_i(VALUE i, VALUE args) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/