mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-12 23:00:22 +02:00
Code Activity

* strports.c (st_resize_port): Substituted SCM_UCHARS for

Browse source 
SCM_CHARS.
(st_write): Cast argument to strncpy to char ptr.
(scm_mkstrport): Substituted SCM_ROUCHARS for SCM_ROCHARS.
(scm_strport_to_string): Cast argument to scm_makfromstr to char
ptr.
This commit is contained in:
Mikael Djurfeldt 2000-06-12 21:27:04 +00:00
parent e1c7d601ad
commit a4c7145ba4
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libguile/strports.c
View file

@ -105,7 +105,7 @@ st_resize_port (scm_port *pt, off_t new_size)
/* reset buffer in case reallocation moved the string. */ /* reset buffer in case reallocation moved the string. */
{ {
pt->read_buf = pt->write_buf = SCM_CHARS (stream); pt->read_buf = pt->write_buf = SCM_UCHARS (stream);
pt->read_pos = pt->write_pos = pt->write_buf + index; pt->read_pos = pt->write_pos = pt->write_buf + index;
pt->write_end = pt->write_buf + pt->write_buf_size; pt->write_end = pt->write_buf + pt->write_buf_size;
pt->read_end = pt->read_buf + pt->read_buf_size; pt->read_end = pt->read_buf + pt->read_buf_size;
@ -146,7 +146,7 @@ st_write (SCM port, const void *data, size_t size)
int space = pt->write_end - pt->write_pos; int space = pt->write_end - pt->write_pos;
int write_len = (size > space) ? space : size; int write_len = (size > space) ? space : size;
strncpy (pt->write_pos, input, write_len); strncpy ((char *) pt->write_pos, input, write_len);
pt->write_pos += write_len; pt->write_pos += write_len;
size -= write_len; size -= write_len;
input += write_len; input += write_len;
@ -276,7 +276,7 @@ scm_mkstrport (SCM pos, SCM str, long modes, const char *caller)
SCM_SET_CELL_TYPE (z, scm_tc16_strport | modes); SCM_SET_CELL_TYPE (z, scm_tc16_strport | modes);
SCM_SETPTAB_ENTRY (z, pt); SCM_SETPTAB_ENTRY (z, pt);
SCM_SETSTREAM (z, SCM_UNPACK (str)); SCM_SETSTREAM (z, SCM_UNPACK (str));
pt->write_buf = pt->read_buf = SCM_ROCHARS (str); pt->write_buf = pt->read_buf = SCM_ROUCHARS (str);
pt->read_pos = pt->write_pos = pt->read_buf + SCM_INUM (pos); pt->read_pos = pt->write_pos = pt->read_buf + SCM_INUM (pos);
pt->write_buf_size = pt->read_buf_size = str_len; pt->write_buf_size = pt->read_buf_size = str_len;
pt->write_end = pt->read_end = pt->read_buf + pt->read_buf_size; pt->write_end = pt->read_end = pt->read_buf + pt->read_buf_size;
@ -298,7 +298,7 @@ SCM scm_strport_to_string (SCM port)
if (pt->rw_active == SCM_PORT_WRITE) if (pt->rw_active == SCM_PORT_WRITE)
st_flush (port); st_flush (port);
return scm_makfromstr (pt->read_buf, pt->read_buf_size, 0); return scm_makfromstr ((char *) pt->read_buf, pt->read_buf_size, 0);
} }
SCM_DEFINE (scm_call_with_output_string, "call-with-output-string", 1, 0, 0, SCM_DEFINE (scm_call_with_output_string, "call-with-output-string", 1, 0, 0,