diff options
| author | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2014-05-07 01:51:07 +0300 |
|---|---|---|
| committer | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2014-05-07 02:17:14 +0300 |
| commit | b9be45e421b09fe58ba23764f928c1ec8acc37e2 (patch) | |
| tree | 67ebc5781113c30da4accbaac2c4fae3aec5c638 /py | |
| parent | 6e73143de894126c7b453dbe3185b9f1b39d487b (diff) | |
| download | micropython-b9be45e421b09fe58ba23764f928c1ec8acc37e2.tar.gz micropython-b9be45e421b09fe58ba23764f928c1ec8acc37e2.zip | |
stream: Use standard name of DEFAULT_BUFFER_SIZE.
Diffstat (limited to 'py')
| -rw-r--r-- | py/stream.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/py/stream.c b/py/stream.c index d3ec8e298d..96bf94fcd9 100644 --- a/py/stream.c +++ b/py/stream.c @@ -37,6 +37,9 @@ // This file defines generic Python stream read/write methods which // dispatch to the underlying stream interface of an object. +// TODO: should be in mpconfig.h +#define DEFAULT_BUFFER_SIZE 256 + STATIC mp_obj_t stream_readall(mp_obj_t self_in); // TODO: This is POSIX-specific (but then POSIX is the only real thing, @@ -101,8 +104,6 @@ STATIC mp_obj_t stream_write(mp_obj_t self_in, mp_obj_t arg) { } } -// TODO: should be in mpconfig.h -#define READ_SIZE 256 STATIC mp_obj_t stream_readall(mp_obj_t self_in) { struct _mp_obj_base_t *o = (struct _mp_obj_base_t *)self_in; if (o->type->stream_p == NULL || o->type->stream_p->read == NULL) { @@ -111,11 +112,11 @@ STATIC mp_obj_t stream_readall(mp_obj_t self_in) { } int total_size = 0; - vstr_t *vstr = vstr_new_size(READ_SIZE); + vstr_t *vstr = vstr_new_size(DEFAULT_BUFFER_SIZE); char *buf = vstr_str(vstr); char *p = buf; int error; - int current_read = READ_SIZE; + int current_read = DEFAULT_BUFFER_SIZE; while (true) { machine_int_t out_sz = o->type->stream_p->read(self_in, p, current_read, &error); if (out_sz == -1) { @@ -138,7 +139,7 @@ STATIC mp_obj_t stream_readall(mp_obj_t self_in) { current_read -= out_sz; p += out_sz; } else { - current_read = READ_SIZE; + current_read = DEFAULT_BUFFER_SIZE; p = vstr_extend(vstr, current_read); if (p == NULL) { // TODO |