diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-02-28 07:49:06 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-02-28 07:49:06 +0000 |
| commit | c0c182bf880ee749ca43921bbb1bc1a95d66c3d5 (patch) | |
| tree | 34052a9734b842c1c45dc904c0243700d225c81e | |
| parent | 4960e66ab64350c6a6cc89b3b40fcd842dfa65d9 (diff) | |
* ext/openssl/ossl_pkcs12.c: parenthesize macro arguments.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30978 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ext/openssl/ossl_pkcs12.c | 12 |
2 files changed, 10 insertions, 6 deletions
@@ -1,3 +1,7 @@ +Mon Feb 28 16:48:42 2011 Tanaka Akira <akr@fsij.org> + + * ext/openssl/ossl_pkcs12.c: parenthesize macro arguments. + Mon Feb 28 16:28:15 2011 NARUSE, Yui <naruse@ruby-lang.org> * string.c (tr_trans): when the hash for multibyte repl is empty, diff --git a/ext/openssl/ossl_pkcs12.c b/ext/openssl/ossl_pkcs12.c index 85e092b251..3628374b4e 100644 --- a/ext/openssl/ossl_pkcs12.c +++ b/ext/openssl/ossl_pkcs12.c @@ -6,18 +6,18 @@ #include "ossl.h" #define WrapPKCS12(klass, obj, p12) do { \ - if(!p12) ossl_raise(rb_eRuntimeError, "PKCS12 wasn't initialized."); \ - obj = Data_Wrap_Struct(klass, 0, PKCS12_free, p12); \ + if(!(p12)) ossl_raise(rb_eRuntimeError, "PKCS12 wasn't initialized."); \ + (obj) = Data_Wrap_Struct((klass), 0, PKCS12_free, (p12)); \ } while (0) #define GetPKCS12(obj, p12) do { \ - Data_Get_Struct(obj, PKCS12, p12); \ - if(!p12) ossl_raise(rb_eRuntimeError, "PKCS12 wasn't initialized."); \ + Data_Get_Struct((obj), PKCS12, (p12)); \ + if(!(p12)) ossl_raise(rb_eRuntimeError, "PKCS12 wasn't initialized."); \ } while (0) #define SafeGetPKCS12(obj, p12) do { \ - OSSL_Check_Kind(obj, cPKCS12); \ - GetPKCS12(obj, p12); \ + OSSL_Check_Kind((obj), cPKCS12); \ + GetPKCS12((obj), (p12)); \ } while (0) #define ossl_pkcs12_set_key(o,v) rb_iv_set((o), "@key", (v)) |