From fe8bb861255035f7903c6f332f3cc87368a9c410 Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 20 May 2008 22:26:14 +0000
Subject: [PATCH] * encoding.c, include/ruby/encoding.h   (rb_enc_associate,
 rb_enc_associate_index):   returns obj. [ruby-dev:34778]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16499 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog               | 6 ++++++
 encoding.c              | 9 +++++----
 include/ruby/encoding.h | 4 ++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6f2e814e0f..239d6d009c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed May 21 07:22:01 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* encoding.c, include/ruby/encoding.h
+	  (rb_enc_associate, rb_enc_associate_index):
+	  returns obj. [ruby-dev:34778]
+
 Wed May 21 04:20:20 2008  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* encoding.c (rb_ascii8bit_encoding): use ENCINDEX_ASCII.
diff --git a/encoding.c b/encoding.c
index e1824f557f..20d47b1e6f 100644
--- a/encoding.c
+++ b/encoding.c
@@ -564,10 +564,10 @@ rb_enc_set_index(VALUE obj, int idx)
     return;
 }
 
-void
+VALUE
 rb_enc_associate_index(VALUE obj, int idx)
 {
-//    enc_check_capable(obj);
+/*    enc_check_capable(obj);*/
     if (rb_enc_get_index(obj) == idx)
     	return;
     if (!ENC_CODERANGE_ASCIIONLY(obj) ||
@@ -575,12 +575,13 @@ rb_enc_associate_index(VALUE obj, int idx)
 	ENC_CODERANGE_CLEAR(obj);
     }
     rb_enc_set_index(obj, idx);
+    return obj;
 }
 
-void
+VALUE
 rb_enc_associate(VALUE obj, rb_encoding *enc)
 {
-    rb_enc_associate_index(obj, rb_enc_to_index(enc));
+    return rb_enc_associate_index(obj, rb_enc_to_index(enc));
 }
 
 rb_encoding*
diff --git a/include/ruby/encoding.h b/include/ruby/encoding.h
index ade293ec6f..e67b834c0b 100644
--- a/include/ruby/encoding.h
+++ b/include/ruby/encoding.h
@@ -83,8 +83,8 @@ rb_encoding* rb_to_encoding(VALUE);
 rb_encoding* rb_enc_get(VALUE);
 rb_encoding* rb_enc_compatible(VALUE,VALUE);
 rb_encoding* rb_enc_check(VALUE,VALUE);
-void rb_enc_associate_index(VALUE, int);
-void rb_enc_associate(VALUE, rb_encoding*);
+VALUE rb_enc_associate_index(VALUE, int);
+VALUE rb_enc_associate(VALUE, rb_encoding*);
 void rb_enc_copy(VALUE dst, VALUE src);
 
 VALUE rb_enc_str_new(const char*, long, rb_encoding*);