[前][次][番号順一覧][スレッド一覧]

ruby-changes:19071

From: akr <ko1@a...>
Date: Wed, 16 Mar 2011 08:41:23 +0900 (JST)
Subject: [ruby-changes:19071] Ruby:r31110 (trunk): * ext/openssl/ossl_x509ext.c: parenthesize macro arguments.

akr	2011-03-16 08:41:17 +0900 (Wed, 16 Mar 2011)

  New Revision: 31110

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=31110

  Log:
    * ext/openssl/ossl_x509ext.c: parenthesize macro arguments.

  Modified files:
    trunk/ChangeLog
    trunk/ext/openssl/ossl_x509ext.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 31109)
+++ ChangeLog	(revision 31110)
@@ -1,3 +1,7 @@
+Wed Mar 16 08:40:39 2011  Tanaka Akira  <akr@f...>
+
+	* ext/openssl/ossl_x509ext.c: parenthesize macro arguments.
+
 Tue Mar 15 18:34:27 2011  Tanaka Akira  <akr@f...>
 
 	* ext/openssl/ossl_x509crl.c: parenthesize macro arguments.
Index: ext/openssl/ossl_x509ext.c
===================================================================
--- ext/openssl/ossl_x509ext.c	(revision 31109)
+++ ext/openssl/ossl_x509ext.c	(revision 31110)
@@ -11,30 +11,30 @@
 #include "ossl.h"
 
 #define WrapX509Ext(klass, obj, ext) do { \
-    if (!ext) { \
+    if (!(ext)) { \
 	ossl_raise(rb_eRuntimeError, "EXT wasn't initialized!"); \
     } \
-    obj = Data_Wrap_Struct(klass, 0, X509_EXTENSION_free, ext); \
+    (obj) = Data_Wrap_Struct((klass), 0, X509_EXTENSION_free, (ext)); \
 } while (0)
 #define GetX509Ext(obj, ext) do { \
-    Data_Get_Struct(obj, X509_EXTENSION, ext); \
-    if (!ext) { \
+    Data_Get_Struct((obj), X509_EXTENSION, (ext)); \
+    if (!(ext)) { \
 	ossl_raise(rb_eRuntimeError, "EXT wasn't initialized!"); \
     } \
 } while (0)
 #define SafeGetX509Ext(obj, ext) do { \
-    OSSL_Check_Kind(obj, cX509Ext); \
-    GetX509Ext(obj, ext); \
+    OSSL_Check_Kind((obj), cX509Ext); \
+    GetX509Ext((obj), (ext)); \
 } while (0)
 #define MakeX509ExtFactory(klass, obj, ctx) do { \
-    if (!(ctx = OPENSSL_malloc(sizeof(X509V3_CTX)))) \
+    if (!((ctx) = OPENSSL_malloc(sizeof(X509V3_CTX)))) \
         ossl_raise(rb_eRuntimeError, "CTX wasn't allocated!"); \
-    X509V3_set_ctx(ctx, NULL, NULL, NULL, NULL, 0); \
-    obj = Data_Wrap_Struct(klass, 0, ossl_x509extfactory_free, ctx); \
+    X509V3_set_ctx((ctx), NULL, NULL, NULL, NULL, 0); \
+    (obj) = Data_Wrap_Struct((klass), 0, ossl_x509extfactory_free, (ctx)); \
 } while (0)
 #define GetX509ExtFactory(obj, ctx) do { \
-    Data_Get_Struct(obj, X509V3_CTX, ctx); \
-    if (!ctx) { \
+    Data_Get_Struct((obj), X509V3_CTX, (ctx)); \
+    if (!(ctx)) { \
 	ossl_raise(rb_eRuntimeError, "CTX wasn't initialized!"); \
     } \
 } while (0)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]