summaryrefslogtreecommitdiffstats
path: root/encoding.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-10-22 02:06:50 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-10-22 02:06:50 +0000
commitcf5402cace024161b8f53502f4c4def075f0f63c (patch)
tree3846e265cd9d3966689df22b0138aadc755e854e /encoding.c
parente091aa7f84be6c9e875b317716f4577e873b3779 (diff)
downloadruby-cf5402cace024161b8f53502f4c4def075f0f63c.tar.gz
ruby-cf5402cace024161b8f53502f4c4def075f0f63c.tar.xz
ruby-cf5402cace024161b8f53502f4c4def075f0f63c.zip
* encoding.c (rb_to_encoding_index, rb_to_encoding): commit miss.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@13752 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'encoding.c')
-rw-r--r--encoding.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/encoding.c b/encoding.c
index d088473d6..2c2563ab0 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));
}