diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-08-03 01:56:01 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-08-03 01:56:01 +0000 |
commit | 1d670ab0f090c0232e2a7a619b70ebb559453331 (patch) | |
tree | 8b603d1279d3e5f4e53e4d5407074c46a0639920 /ext/openssl | |
parent | fdfb939d72e8b66540df42821e3facfcda5aaf15 (diff) | |
download | ruby-1d670ab0f090c0232e2a7a619b70ebb559453331.tar.gz |
ext: prefer RB_TYPE_P over comparison TYPE with constants
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47042 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/openssl')
-rw-r--r-- | ext/openssl/ossl_bio.c | 2 | ||||
-rw-r--r-- | ext/openssl/ossl_digest.c | 2 | ||||
-rw-r--r-- | ext/openssl/ossl_pkcs7.c | 2 | ||||
-rw-r--r-- | ext/openssl/ossl_ssl.c | 8 |
4 files changed, 7 insertions, 7 deletions
diff --git a/ext/openssl/ossl_bio.c b/ext/openssl/ossl_bio.c index a11c08c1a3..e150de0ad9 100644 --- a/ext/openssl/ossl_bio.c +++ b/ext/openssl/ossl_bio.c @@ -18,7 +18,7 @@ ossl_obj2bio(VALUE obj) { BIO *bio; - if (TYPE(obj) == T_FILE) { + if (RB_TYPE_P(obj, T_FILE)) { rb_io_t *fptr; FILE *fp; int fd; diff --git a/ext/openssl/ossl_digest.c b/ext/openssl/ossl_digest.c index fdf13e98e5..7e5e7ff1ab 100644 --- a/ext/openssl/ossl_digest.c +++ b/ext/openssl/ossl_digest.c @@ -38,7 +38,7 @@ GetDigestPtr(VALUE obj) const EVP_MD *md; ASN1_OBJECT *oid = NULL; - if (TYPE(obj) == T_STRING) { + if (RB_TYPE_P(obj, T_STRING)) { const char *name = StringValueCStr(obj); md = EVP_get_digestbyname(name); diff --git a/ext/openssl/ossl_pkcs7.c b/ext/openssl/ossl_pkcs7.c index 553a580923..66c20538d8 100644 --- a/ext/openssl/ossl_pkcs7.c +++ b/ext/openssl/ossl_pkcs7.c @@ -376,7 +376,7 @@ ossl_pkcs7_sym2typeid(VALUE sym) { NULL, 0 }, }; - if(TYPE(sym) == T_SYMBOL) s = rb_id2name(SYM2ID(sym)); + if (RB_TYPE_P(sym, T_SYMBOL)) s = rb_id2name(SYM2ID(sym)); else s = StringValuePtr(sym); for(i = 0; i < numberof(p7_type_tab); i++){ if(p7_type_tab[i].name == NULL) diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c index f314a7ac25..a13255f90e 100644 --- a/ext/openssl/ossl_ssl.c +++ b/ext/openssl/ossl_ssl.c @@ -190,7 +190,7 @@ ossl_sslctx_set_ssl_version(VALUE self, VALUE ssl_method) int i; SSL_CTX *ctx; - if(TYPE(ssl_method) == T_SYMBOL) + if (RB_TYPE_P(ssl_method, T_SYMBOL)) s = rb_id2name(SYM2ID(ssl_method)); else s = StringValuePtr(ssl_method); @@ -716,7 +716,7 @@ ossl_sslctx_setup(VALUE self) val = ossl_sslctx_get_client_ca(self); if(!NIL_P(val)){ - if(TYPE(val) == T_ARRAY){ + if (RB_TYPE_P(val, T_ARRAY)) { for(i = 0; i < RARRAY_LEN(val); i++){ client_ca = GetX509CertPtr(RARRAY_PTR(val)[i]); if (!SSL_CTX_add_client_CA(ctx, client_ca)){ @@ -882,11 +882,11 @@ ossl_sslctx_set_ciphers(VALUE self, VALUE v) rb_check_frozen(self); if (NIL_P(v)) return v; - else if (TYPE(v) == T_ARRAY) { + else if (RB_TYPE_P(v, T_ARRAY)) { str = rb_str_new(0, 0); for (i = 0; i < RARRAY_LEN(v); i++) { elem = rb_ary_entry(v, i); - if (TYPE(elem) == T_ARRAY) elem = rb_ary_entry(elem, 0); + if (RB_TYPE_P(elem, T_ARRAY)) elem = rb_ary_entry(elem, 0); elem = rb_String(elem); rb_str_append(str, elem); if (i < RARRAY_LEN(v)-1) rb_str_cat2(str, ":"); |