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

* io.c (io_enc_str): code conversion removed.

Browse Source 
(io_enc_str_converted): removed because it is identical to
  io_enc_str now.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18686 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2008-08-18 03:47:15 +00:00
parent 6f1fe004f7
commit 08dcd12235
2 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Mon Aug 18 12:45:24 2008 Tanaka Akira <akr@fsij.org>
* io.c (io_enc_str): code conversion removed.
(io_enc_str_converted): removed because it is identical to
io_enc_str now.
Mon Aug 18 12:12:29 2008 Tanaka Akira <akr@fsij.org> Mon Aug 18 12:12:29 2008 Tanaka Akira <akr@fsij.org>
* io.c (io_shift_crbuf): add strp argument to append into existing * io.c (io_shift_crbuf): add strp argument to append into existing

22
io.c
View File

@ -1382,24 +1382,6 @@ remain_size(rb_io_t *fptr)
static VALUE static VALUE
io_enc_str(VALUE str, rb_io_t *fptr) io_enc_str(VALUE str, rb_io_t *fptr)
{
OBJ_TAINT(str);
if (fptr->enc2) {
/* two encodings, so transcode from enc2 to enc */
/* the methods in transcode.c are static, so call indirectly */
str = rb_funcall(str, id_encode, 2,
rb_enc_from_encoding(fptr->enc),
rb_enc_from_encoding(fptr->enc2));
}
else {
/* just one encoding, so associate it with the string */
rb_enc_associate(str, io_read_encoding(fptr));
}
return str;
}
static VALUE
io_enc_str_converted(VALUE str, rb_io_t *fptr)
{ {
OBJ_TAINT(str); OBJ_TAINT(str);
rb_enc_associate(str, io_read_encoding(fptr)); rb_enc_associate(str, io_read_encoding(fptr));
@ -1526,7 +1508,7 @@ read_all(rb_io_t *fptr, long siz, VALUE str)
io_shift_crbuf(fptr, fptr->crbuf_len, &str); io_shift_crbuf(fptr, fptr->crbuf_len, &str);
} }
if (more_char(fptr) == -1) { if (more_char(fptr) == -1) {
return io_enc_str_converted(str, fptr); return io_enc_str(str, fptr);
} }
} }
} }
@ -2147,7 +2129,7 @@ rb_io_getline_1(VALUE rs, long limit, VALUE io)
} }
} }
if (!NIL_P(str)) if (!NIL_P(str))
str = io_enc_str_converted(str, fptr); str = io_enc_str(str, fptr);
} }
if (!NIL_P(str)) { if (!NIL_P(str)) {