From 022b3368dae3f2c9063451c7f2be67a4c4ce8040 Mon Sep 17 00:00:00 2001 From: akr Date: Fri, 18 Mar 2011 11:45:43 +0000 Subject: [PATCH] * ext/openssl/ossl_x509req.c: parenthesize macro arguments. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31124 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 +++++- ext/openssl/ossl_x509req.c | 12 ++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0ceff5df6f..de2aca677f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Fri Mar 18 20:44:36 2011 Tanaka Akira + + * ext/openssl/ossl_x509req.c: parenthesize macro arguments. + Fri Mar 18 08:48:06 2011 Oleg Shaldybin * lib/fileutils.rb (FileUtils::Entry_#copy_file): updated FileUtils.cp @@ -15,7 +19,7 @@ Fri Mar 18 00:54:20 2011 Nobuyoshi Nakada * include/ruby/ruby.h (rb_funcall_passing_block): add prototype. a patch by James M. Lawrence at [ruby-core:35501] -Wed Mar 16 08:40:39 2011 Tanaka Akira +Wed Mar 17 06:23:31 2011 Tanaka Akira * ext/openssl/ossl_x509name.c: parenthesize macro arguments. diff --git a/ext/openssl/ossl_x509req.c b/ext/openssl/ossl_x509req.c index 368bff2776..f68d215da5 100644 --- a/ext/openssl/ossl_x509req.c +++ b/ext/openssl/ossl_x509req.c @@ -11,20 +11,20 @@ #include "ossl.h" #define WrapX509Req(klass, obj, req) do { \ - if (!req) { \ + if (!(req)) { \ ossl_raise(rb_eRuntimeError, "Req wasn't initialized!"); \ } \ - obj = Data_Wrap_Struct(klass, 0, X509_REQ_free, req); \ + (obj) = Data_Wrap_Struct((klass), 0, X509_REQ_free, (req)); \ } while (0) #define GetX509Req(obj, req) do { \ - Data_Get_Struct(obj, X509_REQ, req); \ - if (!req) { \ + Data_Get_Struct((obj), X509_REQ, (req)); \ + if (!(req)) { \ ossl_raise(rb_eRuntimeError, "Req wasn't initialized!"); \ } \ } while (0) #define SafeGetX509Req(obj, req) do { \ - OSSL_Check_Kind(obj, cX509Req); \ - GetX509Req(obj, req); \ + OSSL_Check_Kind((obj), cX509Req); \ + GetX509Req((obj), (req)); \ } while (0) /*