1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

win32/file.c: use encoding index

Browse Source 
* win32/file.c (code_page): use encoding index, which is primary
  entity, instead of encoding name.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43168 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-10-07 06:50:18 +00:00
parent 5df9f0d839
commit 98e4a412e4
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
win32/file.c
View File

@ -176,7 +176,8 @@ system_code_page(void)
static UINT static UINT
code_page(rb_encoding *enc) code_page(rb_encoding *enc)
{ {
st_data_t enc_name, code_page_value; int enc_idx;
st_data_t code_page_value;
VALUE encoding, names_ary = Qundef, name; VALUE encoding, names_ary = Qundef, name;
ID names; ID names;
long i; long i;
@ -184,19 +185,19 @@ code_page(rb_encoding *enc)
if (!enc) if (!enc)
return system_code_page(); return system_code_page();
enc_idx = rb_enc_to_index(enc);
/* map US-ASCII and ASCII-8bit as code page 1252 (us-ascii) */ /* map US-ASCII and ASCII-8bit as code page 1252 (us-ascii) */
if (enc == rb_usascii_encoding() || enc == rb_ascii8bit_encoding()) { if (enc_idx == rb_usascii_encindex() || enc_idx == rb_ascii8bit_encindex()) {
return 1252; return 1252;
} }
enc_name = (st_data_t)rb_enc_name(enc);
if (rb_code_page) { if (rb_code_page) {
if (st_lookup(rb_code_page, enc_name, &code_page_value)) if (st_lookup(rb_code_page, enc_idx, &code_page_value))
return (UINT)code_page_value; return (UINT)code_page_value;
} }
else { else {
rb_code_page = st_init_strcasetable(); rb_code_page = st_init_numtable();
} }
code_page_value = INVALID_CODE_PAGE; code_page_value = INVALID_CODE_PAGE;
@ -216,7 +217,7 @@ code_page(rb_encoding *enc)
} }
} }
st_insert(rb_code_page, enc_name, code_page_value); st_insert(rb_code_page, enc_idx, code_page_value);
return (UINT)code_page_value; return (UINT)code_page_value;
} }