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

* encoding.c (rb_enc_register): do not use based_encoding to check if

Browse Source 
dummy encoding.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14674 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2007-12-25 06:59:53 +00:00
parent f1fc4bbecb
commit 75e4572768
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Tue Dec 25 15:59:51 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* encoding.c (rb_enc_register): do not use based_encoding to check if
dummy encoding.
Tue Dec 25 15:55:14 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> Tue Dec 25 15:55:14 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (rb_str_succ): fix for string with non-alphanumeric chars. * string.c (rb_str_succ): fix for string with non-alphanumeric chars.

3
encoding.c
View File

@ -166,7 +166,6 @@ enc_register(const char *name, rb_encoding *encoding)
return enc_register_at(index - 1, name, encoding); return enc_register_at(index - 1, name, encoding);
} }
static VALUE enc_based_encoding(VALUE);
static void set_encoding_const(const char *, rb_encoding *); static void set_encoding_const(const char *, rb_encoding *);
int rb_enc_registered(const char *name); int rb_enc_registered(const char *name);
@ -183,7 +182,7 @@ rb_enc_register(const char *name, rb_encoding *encoding)
index = enc_register(name, encoding); index = enc_register(name, encoding);
} }
else if (enc_initialized_p(oldenc) && else if (enc_initialized_p(oldenc) &&
!NIL_P(enc_based_encoding(ENC_FROM_ENCODING(oldenc)))) { !ENC_DUMMY_P(ENC_FROM_ENCODING(oldenc))) {
enc_register_at(index, name, encoding); enc_register_at(index, name, encoding);
} }
else { else {