summaryrefslogtreecommitdiff
path: root/libguile/ports.c
diff options
context:
space:
mode:
authorGary Houston <ghouston@arglist.com>1999-07-14 13:55:01 +0000
committerGary Houston <ghouston@arglist.com>1999-07-14 13:55:01 +0000
commit5c070ca7fdce71d333a4d8ac0c504a77d4feaa89 (patch)
treed6535b59db9622f8661d00c5c6166ed2e3acf6be /libguile/ports.c
parent3fe6190f46da0ac53fc7f4af860789cb33bd642e (diff)
downloadguile-5c070ca7fdce71d333a4d8ac0c504a77d4feaa89.tar.gz
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.
Diffstat (limited to 'libguile/ports.c')
-rw-r--r--libguile/ports.c41
1 files changed, 11 insertions, 30 deletions
diff --git a/libguile/ports.c b/libguile/ports.c
index be99fbfb1..1e1595ff0 100644
--- a/libguile/ports.c
+++ b/libguile/ports.c
@@ -333,27 +333,6 @@ scm_remove_from_port_table (port)
scm_port_table_size--;
}
-#if 0
-void
-scm_grow_port_cbuf (port, requested)
- SCM port;
- size_t requested;
-{
- scm_port *p = SCM_PTAB_ENTRY (port);
- int size = p->cbufend - p->cbuf;
- int new_size = size * 3 / 2;
- int count = p->cp - p->cbuf;
-
- if (new_size < requested)
- new_size = requested;
- p = realloc (p, sizeof (*p) - SCM_INITIAL_CBUF_SIZE + new_size);
- p->cp = p->cbuf + count;
- p->bufend = p->cbuf + new_size;
- scm_port_table[p->entry] = p;
- SCM_SETPTAB_ENTRY (port, p);
-}
-#endif
-
#ifdef GUILE_DEBUG
/* Undocumented functions for debugging. */
/* Return the number of ports in the table. */
@@ -628,6 +607,9 @@ scm_read_char (port)
return SCM_MAKICHR (c);
}
+/* this should only be called when the read buffer is empty. it
+ tries to refill the buffer. it returns the first char from
+ the port, which is either EOF or *(pt->read_pos). */
int
scm_fill_buffer (SCM port)
{
@@ -641,7 +623,7 @@ scm_fill_buffer (SCM port)
pt->read_end = pt->saved_read_end;
pt->read_buf_size = pt->saved_read_buf_size;
if (pt->read_pos < pt->read_end)
- return *(pt->read_pos++);
+ return *(pt->read_pos);
}
return scm_ptobs[SCM_PTOBNUM (port)].fill_buffer (port);
}
@@ -659,17 +641,16 @@ scm_getc (port)
scm_ptobs[SCM_PTOBNUM (port)].fflush (port);
}
- if (pt->read_pos < pt->read_end)
- {
- c = *(pt->read_pos++);
- }
- else
+ if (pt->rw_random)
+ pt->rw_active = SCM_PORT_READ;
+
+ if (pt->read_pos >= pt->read_end)
{
- c = scm_fill_buffer (port);
+ if (scm_fill_buffer (port) == EOF)
+ return EOF;
}
- if (pt->rw_random)
- pt->rw_active = SCM_PORT_READ;
+ c = *(pt->read_pos++);
if (c == '\n')
{