summaryrefslogtreecommitdiff
path: root/libguile/read.c
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2016-05-13 11:34:52 +0200
committerAndy Wingo <wingo@pobox.com>2016-05-13 11:34:52 +0200
commit08574987d95c1dbe019398ef5aeb5642f08ac49c (patch)
treeaf1e31bd97b0305692e3cc23524236e7fc218250 /libguile/read.c
parente5d2f4e566586f768bda99c28a74fd2303ecace1 (diff)
downloadguile-08574987d95c1dbe019398ef5aeb5642f08ac49c.tar.gz
Remove scm_t_port_internal
* libguile/ports-internal.h (SCM_PORT): Rename from SCM_PTAB_ENTRY. (scm_t_port_internal, SCM_PORT_GET_INTERNAL): Remove. (SCM_FILENAME, SCM_SET_FILENAME, SCM_LINUM, SCM_COL): Adapt. * libguile/ports.c: * libguile/poll.c: * libguile/ioext.c: * libguile/fports.c: * libguile/filesys.c: * libguile/print.c: * libguile/read.c: * libguile/rw.c: * libguile/strings.c: Adapt.
Diffstat (limited to 'libguile/read.c')
-rw-r--r--libguile/read.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/libguile/read.c b/libguile/read.c
index ede8a613c..3d2a7fde9 100644
--- a/libguile/read.c
+++ b/libguile/read.c
@@ -1059,7 +1059,7 @@ scm_read_character (scm_t_wchar chr, SCM port, scm_t_read_opts *opts)
return (SCM_MAKE_CHAR (chr));
}
- pt = SCM_PTAB_ENTRY (port);
+ pt = SCM_PORT (port);
/* Simple ASCII characters can be processed immediately. Also, simple
ISO-8859-1 characters can be processed immediately if the encoding for this
@@ -2057,7 +2057,7 @@ is_encoding_char (char c)
char *
scm_i_scan_for_encoding (SCM port)
{
- scm_t_port_internal *pti;
+ scm_t_port *pt;
SCM buf;
char header[SCM_ENCODING_SEARCH_SIZE+1];
size_t bytes_read, encoding_length, i;
@@ -2065,10 +2065,10 @@ scm_i_scan_for_encoding (SCM port)
char *pos, *encoding_start;
int in_comment;
- pti = SCM_PORT_GET_INTERNAL (port);
- buf = pti->read_buf;
+ pt = SCM_PORT (port);
+ buf = pt->read_buf;
- if (pti->rw_random)
+ if (pt->rw_random)
scm_flush (port);
if (scm_port_buffer_can_take (buf) == 0)