diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-08-24 07:01:22 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-08-24 07:01:22 +0000 |
commit | 7a89049a7697ce0beaa97f555b06924d40567cc7 (patch) | |
tree | f8b7127db538d49542494b4db3aff93452d9b5ab | |
parent | 73600fd6f8ac22698fdb02f92c7bef13e5128c77 (diff) |
encoding.c: find encoding index
* encoding.c (rb_locale_encindex): find encoding index without
making a string object every time. [ruby-core:58160] [Bug #9080]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51670 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | encoding.c | 10 | ||||
-rw-r--r-- | localeinit.c | 28 | ||||
-rw-r--r-- | miniinit.c | 9 |
4 files changed, 40 insertions, 12 deletions
@@ -1,3 +1,8 @@ +Mon Aug 24 16:01:19 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * encoding.c (rb_locale_encindex): find encoding index without + making a string object every time. [ruby-core:58160] [Bug #9080] + Sat Aug 22 15:43:12 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> * vm_eval.c (check_funcall_failed, check_funcall_missing): cache diff --git a/encoding.c b/encoding.c index b4ee0c8de2..298ff0f1b5 100644 --- a/encoding.c +++ b/encoding.c @@ -1275,16 +1275,14 @@ rb_usascii_encindex(void) return ENCINDEX_US_ASCII; } +int rb_locale_charmap_index(void); + int rb_locale_encindex(void) { - VALUE charmap = rb_locale_charmap(rb_cEncoding); - int idx; + int idx = rb_locale_charmap_index(); - if (NIL_P(charmap)) - idx = ENCINDEX_US_ASCII; - else if ((idx = rb_enc_find_index(StringValueCStr(charmap))) < 0) - idx = ENCINDEX_ASCII; + if (idx < 0) idx = ENCINDEX_ASCII; if (rb_enc_registered("locale") < 0) { # if defined _WIN32 diff --git a/localeinit.c b/localeinit.c index a21b6b1a57..a5368ccc52 100644 --- a/localeinit.c +++ b/localeinit.c @@ -22,8 +22,8 @@ #define CP_FORMAT(buf, codepage) snprintf(buf, sizeof(buf), "CP%u", (codepage)) #endif -VALUE -rb_locale_charmap(VALUE klass) +static VALUE +locale_charmap(VALUE (*conv)(const char *)) { #if defined NO_LOCALE_CHARMAP # error NO_LOCALE_CHARMAP defined @@ -40,16 +40,34 @@ rb_locale_charmap(VALUE klass) CP_FORMAT(cp, codepage); codeset = cp; } - return rb_usascii_str_new2(codeset); + return (*conv)(codeset); #elif defined HAVE_LANGINFO_H char *codeset; codeset = nl_langinfo(CODESET); - return rb_usascii_str_new2(codeset); + return (*conv)(codeset); #else - return Qnil; + return ENCINDEX_US_ASCII; #endif } +VALUE +rb_locale_charmap(VALUE klass) +{ + return locale_charmap(rb_usascii_str_new_cstr); +} + +static VALUE +enc_find_index(const char *name) +{ + return (VALUE)rb_enc_find_index(name); +} + +int +rb_locale_charmap_index(VALUE klass) +{ + return (int)locale_charmap(enc_find_index); +} + int Init_enc_set_filesystem_encoding(void) { diff --git a/miniinit.c b/miniinit.c index 0e05cd0a94..b4bc4dd437 100644 --- a/miniinit.c +++ b/miniinit.c @@ -20,7 +20,14 @@ const char ruby_initial_load_paths[] = ""; VALUE rb_locale_charmap(VALUE klass) { - return rb_usascii_str_new2("ASCII-8BIT"); + /* never used */ + return Qnil; +} + +int +rb_locale_charmap_index(void) +{ + return -1; } int |