summaryrefslogtreecommitdiff
path: root/io.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-08-16 02:52:25 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-08-16 02:52:25 +0000
commit2229b70615ce502c567d6c27357ac2ccfa70eefd (patch)
tree6036f34b37a752dbc9708aa110a936a13484b5a7 /io.c
parent3d923fb9285b4bae77925d362118a463e00867e4 (diff)
* io.c (rb_io_fread): renamed from io_fread and made extern.
* marshal.c (r_bytes0): check if successfully read, use rb_io_fread() instead of fread() to be preemptive. (ruby-bugs-ja:PR#294, 295) * rubyio.h (rb_io_fread): added. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2713 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
-rw-r--r--io.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/io.c b/io.c
index 591ac8d..62b2c36 100644
--- a/io.c
+++ b/io.c
@@ -542,8 +542,8 @@ rb_io_to_io(io)
/* reading functions */
-static long
-io_fread(ptr, len, f)
+long
+rb_io_fread(ptr, len, f)
char *ptr;
long len;
FILE *f;
@@ -650,7 +650,7 @@ read_all(fptr, siz)
if (!siz) siz = BUFSIZ;
str = rb_tainted_str_new(0, siz);
for (;;) {
- n = io_fread(RSTRING(str)->ptr+bytes, siz-bytes, fptr->f);
+ n = rb_io_fread(RSTRING(str)->ptr+bytes, siz-bytes, fptr->f);
if (n == 0 && bytes == 0) {
if (feof(fptr->f)) return Qnil;
rb_sys_fail(fptr->path);
@@ -694,7 +694,7 @@ io_read(argc, argv, io)
if (len == 0) return str;
READ_CHECK(fptr->f);
- n = io_fread(RSTRING(str)->ptr, len, fptr->f);
+ n = rb_io_fread(RSTRING(str)->ptr, len, fptr->f);
if (n == 0) {
if (feof(fptr->f)) return Qnil;
rb_sys_fail(fptr->path);