kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/openssl/ossl_pkcs7.c: parenthesize macro arguments.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30984 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2011-02-28 08:37:24 +00:00
parent 92905e839f
commit c1f400917a
2 changed files with 23 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Mon Feb 28 17:36:57 2011 Tanaka Akira <akr@fsij.org>
* ext/openssl/ossl_pkcs7.c: parenthesize macro arguments.
Mon Feb 28 16:48:42 2011 Tanaka Akira <akr@fsij.org> Mon Feb 28 16:48:42 2011 Tanaka Akira <akr@fsij.org>
* ext/openssl/ossl_pkcs12.c: parenthesize macro arguments. * ext/openssl/ossl_pkcs12.c: parenthesize macro arguments.

38
ext/openssl/ossl_pkcs7.c
View file

@ -11,57 +11,57 @@
#include "ossl.h" #include "ossl.h"
#define WrapPKCS7(klass, obj, pkcs7) do { \ #define WrapPKCS7(klass, obj, pkcs7) do { \
if (!pkcs7) { \ if (!(pkcs7)) { \
ossl_raise(rb_eRuntimeError, "PKCS7 wasn't initialized."); \ ossl_raise(rb_eRuntimeError, "PKCS7 wasn't initialized."); \
} \ } \
obj = Data_Wrap_Struct(klass, 0, PKCS7_free, pkcs7); \ (obj) = Data_Wrap_Struct((klass), 0, PKCS7_free, (pkcs7)); \
} while (0) } while (0)
#define GetPKCS7(obj, pkcs7) do { \ #define GetPKCS7(obj, pkcs7) do { \
Data_Get_Struct(obj, PKCS7, pkcs7); \ Data_Get_Struct((obj), PKCS7, (pkcs7)); \
if (!pkcs7) { \ if (!(pkcs7)) { \
ossl_raise(rb_eRuntimeError, "PKCS7 wasn't initialized."); \ ossl_raise(rb_eRuntimeError, "PKCS7 wasn't initialized."); \
} \ } \
} while (0) } while (0)
#define SafeGetPKCS7(obj, pkcs7) do { \ #define SafeGetPKCS7(obj, pkcs7) do { \
OSSL_Check_Kind(obj, cPKCS7); \ OSSL_Check_Kind((obj), cPKCS7); \
GetPKCS7(obj, pkcs7); \ GetPKCS7((obj), (pkcs7)); \
} while (0) } while (0)
#define WrapPKCS7si(klass, obj, p7si) do { \ #define WrapPKCS7si(klass, obj, p7si) do { \
if (!p7si) { \ if (!(p7si)) { \
ossl_raise(rb_eRuntimeError, "PKCS7si wasn't initialized."); \ ossl_raise(rb_eRuntimeError, "PKCS7si wasn't initialized."); \
} \ } \
obj = Data_Wrap_Struct(klass, 0, PKCS7_SIGNER_INFO_free, p7si); \ (obj) = Data_Wrap_Struct((klass), 0, PKCS7_SIGNER_INFO_free, (p7si)); \
} while (0) } while (0)
#define GetPKCS7si(obj, p7si) do { \ #define GetPKCS7si(obj, p7si) do { \
Data_Get_Struct(obj, PKCS7_SIGNER_INFO, p7si); \ Data_Get_Struct((obj), PKCS7_SIGNER_INFO, (p7si)); \
if (!p7si) { \ if (!(p7si)) { \
ossl_raise(rb_eRuntimeError, "PKCS7si wasn't initialized."); \ ossl_raise(rb_eRuntimeError, "PKCS7si wasn't initialized."); \
} \ } \
} while (0) } while (0)
#define SafeGetPKCS7si(obj, p7si) do { \ #define SafeGetPKCS7si(obj, p7si) do { \
OSSL_Check_Kind(obj, cPKCS7Signer); \ OSSL_Check_Kind((obj), cPKCS7Signer); \
GetPKCS7si(obj, p7si); \ GetPKCS7si((obj), (p7si)); \
} while (0) } while (0)
#define WrapPKCS7ri(klass, obj, p7ri) do { \ #define WrapPKCS7ri(klass, obj, p7ri) do { \
if (!p7ri) { \ if (!(p7ri)) { \
ossl_raise(rb_eRuntimeError, "PKCS7ri wasn't initialized."); \ ossl_raise(rb_eRuntimeError, "PKCS7ri wasn't initialized."); \
} \ } \
obj = Data_Wrap_Struct(klass, 0, PKCS7_RECIP_INFO_free, p7ri); \ (obj) = Data_Wrap_Struct((klass), 0, PKCS7_RECIP_INFO_free, (p7ri)); \
} while (0) } while (0)
#define GetPKCS7ri(obj, p7ri) do { \ #define GetPKCS7ri(obj, p7ri) do { \
Data_Get_Struct(obj, PKCS7_RECIP_INFO, p7ri); \ Data_Get_Struct((obj), PKCS7_RECIP_INFO, (p7ri)); \
if (!p7ri) { \ if (!(p7ri)) { \
ossl_raise(rb_eRuntimeError, "PKCS7ri wasn't initialized."); \ ossl_raise(rb_eRuntimeError, "PKCS7ri wasn't initialized."); \
} \ } \
} while (0) } while (0)
#define SafeGetPKCS7ri(obj, p7ri) do { \ #define SafeGetPKCS7ri(obj, p7ri) do { \
OSSL_Check_Kind(obj, cPKCS7Recipient); \ OSSL_Check_Kind((obj), cPKCS7Recipient); \
GetPKCS7ri(obj, p7ri); \ GetPKCS7ri((obj), (p7ri)); \
} while (0) } while (0)
#define numberof(ary) (int)(sizeof(ary)/sizeof(ary[0])) #define numberof(ary) (int)(sizeof(ary)/sizeof((ary)[0]))
#define ossl_pkcs7_set_data(o,v) rb_iv_set((o), "@data", (v)) #define ossl_pkcs7_set_data(o,v) rb_iv_set((o), "@data", (v))
#define ossl_pkcs7_get_data(o) rb_iv_get((o), "@data") #define ossl_pkcs7_get_data(o) rb_iv_get((o), "@data")