diff options
| author | nobu <nobu@ruby-lang.org> | 2014-08-03 15:19:20 +0000 |
|---|---|---|
| committer | nobu <nobu@ruby-lang.org> | 2014-08-03 15:19:20 +0000 |
| commit | c14b3ea1a8d5c4776be8210852b1c3b7ab47310c (patch) | |
| tree | 7271005aaf3be2cb19b7693dd6f7559b9d105327 /ext/openssl/ossl_pkcs7.c | |
| parent | c120e91692c894b32be6a6c2b12a10f093cecd8e (diff) | |
| download | ruby-openssl-history-c14b3ea1a8d5c4776be8210852b1c3b7ab47310c.tar.gz | |
openssl: constify
* ext/openssl/ossl_asn1.c (ossl_asn1_info): constify.
* ext/openssl/ossl_pkcs7.c (ossl_pkcs7_sym2typeid): constify and
remove sentinel as the count is used.
* ext/openssl/ossl_ssl.c (ossl_ssl_method_tab): constify.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47048 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/openssl/ossl_pkcs7.c')
| -rw-r--r-- | ext/openssl/ossl_pkcs7.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/ext/openssl/ossl_pkcs7.c b/ext/openssl/ossl_pkcs7.c index 23de7dd..bd5dc78 100644 --- a/ext/openssl/ossl_pkcs7.c +++ b/ext/openssl/ossl_pkcs7.c @@ -364,8 +364,8 @@ ossl_pkcs7_sym2typeid(VALUE sym) const char *s; size_t l; - static struct { - const char *name; + static const struct { + char name[20]; int nid; } p7_type_tab[] = { { "signed", NID_pkcs7_signed }, @@ -374,14 +374,13 @@ ossl_pkcs7_sym2typeid(VALUE sym) { "enveloped", NID_pkcs7_enveloped }, { "encrypted", NID_pkcs7_encrypted }, { "digest", NID_pkcs7_digest }, - { NULL, 0 }, }; if (RB_TYPE_P(sym, T_SYMBOL)) sym = rb_sym2str(sym); else StringValue(sym); RSTRING_GETMEM(sym, s, l); - for(i = 0; i < numberof(p7_type_tab); i++){ - if(p7_type_tab[i].name == NULL) + for(i = 0; ; i++){ + if(i == numberof(p7_type_tab)) ossl_raise(ePKCS7Error, "unknown type \"%s\"", s); if(strlen(p7_type_tab[i].name) != l) continue; if(strcmp(p7_type_tab[i].name, s) == 0){ |