mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-06-14 15:40:19 +02:00
1999-07-14 Gary Houston <ghouston@easynet.co.uk>
* unif.c (scm_uniform_array_read_x), ports.c (scm_getc): increment read_pos after scm_fill_buffer. * ioext.c (scm_do_read_line): simplify by ignoring the fill_buffer return char. * vports.c (sf_fill_buffer), strports.c (stfill_buffer), fports.c (fport_fill_buffer): implement the interface change. * ports.c (scm_fill_buffer): interface change: no longer increments read_pos past the character that's returned. it seems clearer to leave it to the caller to decide what to do (thanks Jim). * vports.c (sf_fill_buffer): put the read char into the buffer as well as returning it. * ports.c (scm_grow_port_cbuf): residue of this deleted procedure deleted.
This commit is contained in:
parent
3fe6190f46
commit
5c070ca7fd
7 changed files with 47 additions and 60 deletions
|
@ -1564,9 +1564,7 @@ loop:
|
|||
}
|
||||
else
|
||||
{
|
||||
int ch = scm_fill_buffer (port_or_fd);
|
||||
|
||||
if (ch == EOF)
|
||||
if (scm_fill_buffer (port_or_fd) == EOF)
|
||||
{
|
||||
if (remaining % sz != 0)
|
||||
{
|
||||
|
@ -1577,9 +1575,6 @@ loop:
|
|||
ans -= remaining / sz;
|
||||
break;
|
||||
}
|
||||
|
||||
*dest++ = ch;
|
||||
remaining--;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue