summaryrefslogtreecommitdiff
path: root/io.c
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-11-18 15:47:41 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-11-18 15:47:41 +0000
commit973841cb73ae6bb41f15325400493ad7680bb67a (patch)
tree104173e2da20f4fc9257a61fe70cd37c181ddf9b /io.c
parent1e7f2caa1f4f823d128261df4441c9e30236bc4a (diff)
* io.c (MORE_CHAR_SUSPENDED): renamed from MORE_CHAR_CBUF_FULL.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25847 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
-rw-r--r--io.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/io.c b/io.c
index 5c10c69930..7b0afa44cd 100644
--- a/io.c
+++ b/io.c
@@ -1582,7 +1582,7 @@ make_readconv(rb_io_t *fptr, int size)
}
}
-#define MORE_CHAR_CBUF_FULL Qtrue
+#define MORE_CHAR_SUSPENDED Qtrue
#define MORE_CHAR_FINISHED Qnil
static VALUE
fill_cbuf(rb_io_t *fptr, int ec_flags)
@@ -1597,7 +1597,7 @@ fill_cbuf(rb_io_t *fptr, int ec_flags)
ec_flags |= ECONV_PARTIAL_INPUT;
if (fptr->cbuf_len == fptr->cbuf_capa)
- return MORE_CHAR_CBUF_FULL; /* cbuf full */
+ return MORE_CHAR_SUSPENDED; /* cbuf full */
if (fptr->cbuf_len == 0)
fptr->cbuf_off = 0;
else if (fptr->cbuf_off + fptr->cbuf_len == fptr->cbuf_capa) {
@@ -1629,7 +1629,7 @@ fill_cbuf(rb_io_t *fptr, int ec_flags)
return exc;
if (cbuf_len0 != fptr->cbuf_len)
- return MORE_CHAR_CBUF_FULL;
+ return MORE_CHAR_SUSPENDED;
if (res == econv_finished) {
return MORE_CHAR_FINISHED;
@@ -1656,7 +1656,7 @@ more_char(rb_io_t *fptr)
{
VALUE v;
v = fill_cbuf(fptr, ECONV_AFTER_OUTPUT);
- if (v != MORE_CHAR_CBUF_FULL && v != MORE_CHAR_FINISHED)
+ if (v != MORE_CHAR_SUSPENDED && v != MORE_CHAR_FINISHED)
rb_exc_raise(v);
return v;
}
@@ -1708,7 +1708,7 @@ read_all(rb_io_t *fptr, long siz, VALUE str)
io_shift_cbuf(fptr, fptr->cbuf_len, &str);
}
v = fill_cbuf(fptr, 0);
- if (v != MORE_CHAR_CBUF_FULL && v != MORE_CHAR_FINISHED) {
+ if (v != MORE_CHAR_SUSPENDED && v != MORE_CHAR_FINISHED) {
if (fptr->cbuf_len) {
io_shift_cbuf(fptr, fptr->cbuf_len, &str);
}