mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-20 11:40:18 +02:00
Code Activity

Remove SCM backlink in port structure

Browse source 
* libguile/ports.h (scm_t_port): Remove port backlink.
* libguile/ports.c (scm_c_make_port_with_encoding, scm_fill_input)
  (scm_seek): Adapt.
This commit is contained in:
Andy Wingo 2016-05-13 10:16:27 +02:00
parent 6ff542ee71
commit fe7ceff969
2 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
libguile/ports.c
View file

@ -735,7 +735,6 @@ scm_c_make_port_with_encoding (scm_t_bits tag, unsigned long mode_bits,
entry->internal = pti; entry->internal = pti;
entry->file_name = SCM_BOOL_F; entry->file_name = SCM_BOOL_F;
entry->port = ret;
entry->stream = stream; entry->stream = stream;
entry->encoding = encoding; entry->encoding = encoding;
entry->conversion_strategy = conversion_strategy; entry->conversion_strategy = conversion_strategy;
@ -2455,7 +2454,7 @@ scm_fill_input (SCM port, size_t minimum_size)
return read_buf; return read_buf;
if (pt->rw_random) if (pt->rw_random)
scm_flush (pt->port); scm_flush (port);
/* Prepare to read. Make sure there is enough space in the buffer for /* Prepare to read. Make sure there is enough space in the buffer for
minimum_size, and ensure that cur is zero so that we fill towards minimum_size, and ensure that cur is zero so that we fill towards
@ -2874,8 +2873,8 @@ SCM_DEFINE (scm_seek, "seek", 3, 0, 0,
/* FIXME: Avoid flushing buffers for SEEK_CUR with an offset of /* FIXME: Avoid flushing buffers for SEEK_CUR with an offset of
0. */ 0. */
scm_end_input (pt->port); scm_end_input (fd_port);
scm_flush (pt->port); scm_flush (fd_port);
rv = ptob->seek (fd_port, off, how); rv = ptob->seek (fd_port, off, how);

3
libguile/ports.h
View file

@ -81,9 +81,6 @@ enum scm_port_buffer_field {
typedef struct typedef struct
{ {
/* Link back to the port object. */
SCM port;
/* Pointer to internal-only port structure. */ /* Pointer to internal-only port structure. */
struct scm_port_internal *internal; struct scm_port_internal *internal;