From 7a89049a7697ce0beaa97f555b06924d40567cc7 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 24 Aug 2015 07:01:22 +0000
Subject: 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
---
 localeinit.c | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

(limited to 'localeinit.c')

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)
 {
-- 
cgit v1.2.3