diff options
author | Marius Vollmer <mvo@zagadka.de> | 2004-08-12 17:45:03 +0000 |
---|---|---|
committer | Marius Vollmer <mvo@zagadka.de> | 2004-08-12 17:45:03 +0000 |
commit | 8824ac88f08cffc954a907b85858ccd5b3c9843f (patch) | |
tree | c96fa1d142124eaf6f030adbc4ec2eb040b612b0 /libguile/symbols.c | |
parent | 70f7ee4188c0a752154d8cc63daf5a99ba89951f (diff) | |
download | guile-8824ac88f08cffc954a907b85858ccd5b3c9843f.tar.gz |
* socket.c, rw.c, deprecated.h, validate.h
(SCM_VALIDATE_STRING_COPY): Deprecated. Replaced all uses with
SCM_VALIDATE_STRING plus SCM_I_STRING_CHARS or
scm_to_locale_string, etc.
(SCM_VALIDATE_SUBSTRING_SPEC_COPY): Deprecated. Replaced as
above, plus scm_i_get_substring_spec.
* regex-posix.c, read.c, random.c, ramap.c, print.c, numbers.c,
hash.c, gc.c, gc-card.c, convert.i.c, backtrace.c, strop.c,
strorder.c, strports.c, struct.c, symbols.c, unif.c, ports.c: Use
SCM_I_STRING_CHARS, SCM_I_STRING_UCHARS, and SCM_I_STRING_LENGTH
instead of SCM_STRING_CHARS, SCM_STRING_UCHARS, and
SCM_STRING_LENGTH, respectively. Also, replaced scm_return_first
with more explicit scm_remember_upto_here_1, etc, or introduced
them in the first place.
Diffstat (limited to 'libguile/symbols.c')
-rw-r--r-- | libguile/symbols.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libguile/symbols.c b/libguile/symbols.c index f7fd68145..dc413c369 100644 --- a/libguile/symbols.c +++ b/libguile/symbols.c @@ -186,8 +186,8 @@ SCM_DEFINE (scm_make_symbol, "make-symbol", 1, 0, 0, { SCM sym; SCM_VALIDATE_STRING (1, name); - sym = scm_mem2uninterned_symbol (SCM_STRING_CHARS (name), - SCM_STRING_LENGTH (name)); + sym = scm_mem2uninterned_symbol (SCM_I_STRING_CHARS (name), + SCM_I_STRING_LENGTH (name)); scm_remember_upto_here_1 (name); return sym; } @@ -255,8 +255,8 @@ SCM_DEFINE (scm_string_to_symbol, "string->symbol", 1, 0, 0, { SCM sym; SCM_VALIDATE_STRING (1, string); - sym = scm_mem2symbol (SCM_STRING_CHARS (string), - SCM_STRING_LENGTH (string)); + sym = scm_mem2symbol (SCM_I_STRING_CHARS (string), + SCM_I_STRING_LENGTH (string)); scm_remember_upto_here_1 (string); return sym; } @@ -287,10 +287,11 @@ SCM_DEFINE (scm_gensym, "gensym", 0, 1, 0, else { SCM_VALIDATE_STRING (1, prefix); - len = SCM_STRING_LENGTH (prefix); + len = SCM_I_STRING_LENGTH (prefix); if (len > MAX_PREFIX_LENGTH) name = scm_malloc (len + SCM_INTBUFLEN); - memcpy (name, SCM_STRING_CHARS (prefix), len); + memcpy (name, SCM_I_STRING_CHARS (prefix), len); + scm_remember_upto_here_1 (prefix); } { int n, n_digits; |