mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-16 16:50:21 +02:00
Code Activity

* gh_data.c (gh_scm2newstr, gh_get_substr): Use RO macros for

Browse source 
dealing with strings.
This commit is contained in:
Tim Pierce 1997-12-16 05:09:50 +00:00
parent 848f2a0114
commit 66d1e129c9
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
libguile/ChangeLog
View file

@ -1,3 +1,8 @@
1997-12-15 Tim Pierce <twp@skepsis.com>
* gh_data.c (gh_scm2newstr, gh_get_substr): Use RO macros for
dealing with strings.
1997-12-13 Tim Pierce <twp@skepsis.com> 1997-12-13 Tim Pierce <twp@skepsis.com>
Make %read-line more suitable for implementing read-line efficiently. Make %read-line more suitable for implementing read-line efficiently.

8
libguile/gh_data.c
View file

@ -176,7 +176,7 @@ gh_scm2newstr (SCM str, int *lenp)
char *ret_str; char *ret_str;
int len; int len;
SCM_ASSERT (SCM_NIMP (str) && SCM_STRINGP (str), str, SCM_ARG3, SCM_ASSERT (SCM_NIMP (str) && SCM_ROSTRINGP (str), str, SCM_ARG3,
"gh_scm2newstr"); "gh_scm2newstr");
/* protect str from GC while we copy off its data */ /* protect str from GC while we copy off its data */
@ -187,7 +187,7 @@ gh_scm2newstr (SCM str, int *lenp)
ret_str = (char *) scm_must_malloc ((len + 1) * sizeof (char), ret_str = (char *) scm_must_malloc ((len + 1) * sizeof (char),
"gh_scm2newstr"); "gh_scm2newstr");
/* so we copy tmp_str to ret_str, which is what we will allocate */ /* so we copy tmp_str to ret_str, which is what we will allocate */
memcpy (ret_str, SCM_CHARS (str), len); memcpy (ret_str, SCM_ROCHARS (str), len); /* test ROCHARS here -twp */
/* now make sure we null-terminate it */ /* now make sure we null-terminate it */
ret_str[len] = '\0'; ret_str[len] = '\0';
@ -213,13 +213,13 @@ void
gh_get_substr (SCM src, char *dst, int start, int len) gh_get_substr (SCM src, char *dst, int start, int len)
{ {
int src_len, effective_length; int src_len, effective_length;
SCM_ASSERT (SCM_NIMP (src) && SCM_STRINGP (src), src, SCM_ARG3, SCM_ASSERT (SCM_NIMP (src) && SCM_ROSTRINGP (src), src, SCM_ARG3,
"gh_get_substr"); "gh_get_substr");
scm_protect_object (src); scm_protect_object (src);
src_len = SCM_LENGTH (src); src_len = SCM_LENGTH (src);
effective_length = (len < src_len) ? len : src_len; effective_length = (len < src_len) ? len : src_len;
memcpy (dst + start, SCM_CHARS (src), effective_length * sizeof (char)); memcpy (dst + start, SCM_ROCHARS (src), effective_length * sizeof (char));
/* FIXME: must signal an error if len > src_len */ /* FIXME: must signal an error if len > src_len */
scm_unprotect_object (src); scm_unprotect_object (src);
} }