diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-10-22 02:06:50 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-10-22 02:06:50 +0000 |
commit | d0cbfbd995cd601e626fa9796a37b7f4b9eb9e18 (patch) | |
tree | 3846e265cd9d3966689df22b0138aadc755e854e /encoding.c | |
parent | 3cb10b32bbc49236b26b172336633bc26807ee92 (diff) | |
download | ruby-d0cbfbd995cd601e626fa9796a37b7f4b9eb9e18.tar.gz |
* encoding.c (rb_to_encoding_index, rb_to_encoding): commit miss.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13752 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'encoding.c')
-rw-r--r-- | encoding.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/encoding.c b/encoding.c index d088473d61..2c2563ab02 100644 --- a/encoding.c +++ b/encoding.c @@ -88,7 +88,7 @@ rb_to_encoding_index(VALUE enc) if (NIL_P(enc)) return 0; idx = enc_check_encoding(enc); if (idx >= 0) { - return index; + return idx; } else { return rb_enc_find_index(StringValueCStr(enc)); @@ -98,12 +98,11 @@ rb_to_encoding_index(VALUE enc) rb_encoding * rb_to_encoding(VALUE enc) { - rb_encoding *encoding; int idx; if (NIL_P(enc)) return rb_enc_from_index(0); idx = enc_check_encoding(enc); - if (idx >= 0) return RDATA(obj)->data; + if (idx >= 0) return RDATA(enc)->data; if ((idx = rb_enc_find_index(StringValueCStr(enc))) < 0) { rb_raise(rb_eArgError, "unknown encoding name - %s", RSTRING_PTR(enc)); } |