diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-26 10:35:00 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-26 10:35:00 +0000 |
| commit | 942ad83ad852124970690c53532674d7cff6aade (patch) | |
| tree | 6d1edf5c76e7e71f6de5cc3b7870c82e99fa492d /transcode.c | |
| parent | 714c31316e224f2244b712531d85f48ca04d0202 (diff) | |
| download | ruby-942ad83ad852124970690c53532674d7cff6aade.tar.gz ruby-942ad83ad852124970690c53532674d7cff6aade.tar.xz ruby-942ad83ad852124970690c53532674d7cff6aade.zip | |
* include/ruby/encoding.h (rb_str_encode): renamed from
rb_str_transcode. [ruby-dev:36593]
(rb_econv_has_convpath_p): renamed from rb_transcode_convertible.
* transcode.c: follow the renaming.
* io.c: ditto.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19589 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'transcode.c')
| -rw-r--r-- | transcode.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/transcode.c b/transcode.c index 9734420ac..43013be0f 100644 --- a/transcode.c +++ b/transcode.c @@ -2596,7 +2596,7 @@ str_encode(int argc, VALUE *argv, VALUE str) } VALUE -rb_str_transcode(VALUE str, VALUE to, int ecflags, VALUE ecopts) +rb_str_encode(VALUE str, VALUE to, int ecflags, VALUE ecopts) { int argc = 1; VALUE *argv = &to; @@ -2845,7 +2845,7 @@ econv_s_search_convpath(int argc, VALUE *argv, VALUE klass) * result: >=0:success -1:failure */ int -rb_transcode_convertible(const char* from_encoding, const char* to_encoding) +rb_econv_has_convpath_p(const char* from_encoding, const char* to_encoding) { VALUE convpath = Qnil; transcode_search_path(from_encoding, to_encoding, search_convpath_i, @@ -3676,7 +3676,7 @@ econv_insert_output(VALUE self, VALUE string) StringValue(string); insert_enc = rb_econv_encoding_to_insert_output(ec); - string = rb_str_transcode(string, rb_enc_from_encoding(rb_enc_find(insert_enc)), 0, Qnil); + string = rb_str_encode(string, rb_enc_from_encoding(rb_enc_find(insert_enc)), 0, Qnil); ret = rb_econv_insert_output(ec, (const unsigned char *)RSTRING_PTR(string), RSTRING_LEN(string), insert_enc); if (ret == -1) { |