diff options
author | Gary Houston <ghouston@arglist.com> | 1999-08-11 18:35:42 +0000 |
---|---|---|
committer | Gary Houston <ghouston@arglist.com> | 1999-08-11 18:35:42 +0000 |
commit | affc96b53388d75ec70547113bf56a3bb481d471 (patch) | |
tree | 0562fad3bf8e49bab278ffe7f04c35b5b0281efa /libguile/unif.c | |
parent | df061ffca7b157760c38c241879af68737b4d395 (diff) | |
download | guile-affc96b53388d75ec70547113bf56a3bb481d471.tar.gz |
1999-08-11 Gary Houston <ghouston@easynet.co.uk>
* fports.c (fport_input_waiting): if select is used, return 1
instead of whatever FD_ISSET expands to. maybe it will be useful
to interpret the value from the input_waiting ptob procedure as a
lower bound on the number of bytes available.
* Mikael asked for a few names to be changed...
* ports.c (scm_make_port_type): take the write procedure as the
second argument instead of the flush procedure.
* ports.h (scm_ptob_descriptor): rename the ptob procedures:
fflush -> flush, read_flush -> end_input, fclose -> close,
fill_buffer -> fill_input, ftruncate -> truncate,
input_waiting_p -> input_waiting.
* ports.c (end_input_void_port): was read_flush_void_port.
(scm_set_port_end_input): was scm_set_port_flush_input.
(scm_set_port_flush): was scm_set_port_write.
(scm_set_port_input_waiting): was scm_set_port_input_waiting_p
(scm_end_input): was scm_read_flush.
(scm_fill_input): was scm_fill_buffer.
(scm_flush): was scm_fflush.
* fports.c (fport_input_waiting): renamed from fport_input_waiting_p.
(fport_end_input): was local_read_flush.
(fport_flush): was local_fflush.
(fport_close): was local_fclose.
(fport_truncate): was local_ftruncate.
(fport_seek): was local_seek.
(fport_free): was local_free.
(fport_fill_input): was fport_fill_buffer.
* strports.c (st_end_input): was st_read_flush.
(st_truncate): was st_ftruncate.
* vports.c: (sf_flush): was sfflush.
(sf_close): was sfclose.
(sf_fill_input): was sf_fill_buffer.
* ports.c, fports.c, strports, vports.c, ioext.c, unif.c, filesys.c:
change callers.
Diffstat (limited to 'libguile/unif.c')
-rw-r--r-- | libguile/unif.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libguile/unif.c b/libguile/unif.c index e4b2c08d4..215897619 100644 --- a/libguile/unif.c +++ b/libguile/unif.c @@ -1547,7 +1547,7 @@ loop: char *dest = SCM_CHARS (v) + (cstart + offset) * sz; if (pt->rw_active == SCM_PORT_WRITE) - scm_fflush (port_or_fd); + scm_flush (port_or_fd); ans = cend - offset; while (remaining > 0) @@ -1564,7 +1564,7 @@ loop: } else { - if (scm_fill_buffer (port_or_fd) == EOF) + if (scm_fill_input (port_or_fd) == EOF) { if (remaining % sz != 0) { |