From 9ee9ae90b8b72590c356159471b9e1ca4d64d8e0 Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 15 Aug 2015 04:32:15 +0000 Subject: use rb_sym2str * ext/openssl/ossl_ssl.c (ossl_sslctx_set_ssl_version): use rb_sym2str to get rid of inadvertent ID creations. * ext/socket/ancdata.c (ancillary_inspect): ditto. * ext/socket/option.c (sockopt_inspect): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51586 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/openssl/ossl_ssl.c | 6 +++--- ext/socket/ancdata.c | 2 +- ext/socket/option.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'ext') diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c index 881057fb44..eaa3dfa2e1 100644 --- a/ext/openssl/ossl_ssl.c +++ b/ext/openssl/ossl_ssl.c @@ -174,13 +174,13 @@ ossl_sslctx_set_ssl_version(VALUE self, VALUE ssl_method) { SSL_METHOD *method = NULL; const char *s; + VALUE m = ssl_method; int i; SSL_CTX *ctx; if (RB_TYPE_P(ssl_method, T_SYMBOL)) - s = rb_id2name(SYM2ID(ssl_method)); - else - s = StringValuePtr(ssl_method); + m = rb_sym2str(ssl_method); + s = StringValuePtr(m); for (i = 0; i < numberof(ossl_ssl_method_tab); i++) { if (strcmp(ossl_ssl_method_tab[i].name, s) == 0) { method = ossl_ssl_method_tab[i].func(); diff --git a/ext/socket/ancdata.c b/ext/socket/ancdata.c index da8b8160d2..9a31cc41e2 100644 --- a/ext/socket/ancdata.c +++ b/ext/socket/ancdata.c @@ -990,7 +990,7 @@ ancillary_inspect(VALUE self) vtype = ip_cmsg_type_to_sym(level, type); if (SYMBOL_P(vtype)) - rb_str_catf(ret, " %s", rb_id2name(SYM2ID(vtype))); + rb_str_catf(ret, " %"PRIsVALUE, rb_sym2str(vtype)); else rb_str_catf(ret, " cmsg_type:%d", type); } diff --git a/ext/socket/option.c b/ext/socket/option.c index b00ffb910c..db7ab8252d 100644 --- a/ext/socket/option.c +++ b/ext/socket/option.c @@ -1244,7 +1244,7 @@ sockopt_inspect(VALUE self) v = optname_to_sym(level, optname); if (SYMBOL_P(v)) - rb_str_catf(ret, " %s", rb_id2name(SYM2ID(v))); + rb_str_catf(ret, " %"PRIsVALUE, rb_sym2str(v)); else rb_str_catf(ret, " optname:%d", optname); } -- cgit v1.2.3