diff options
author | Ludovic Courtès <ludo@gnu.org> | 2008-10-09 22:21:33 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2008-10-09 22:21:33 +0200 |
commit | 45a9f4304955599ee4e772069e56d131401695dd (patch) | |
tree | d4f3afcc9528c8462ec3b45d6c3a4d9185a40ccc /libguile/strings.c | |
parent | 89bc270db3c207b2210736f066ce18721e0dbc76 (diff) | |
download | guile-45a9f4304955599ee4e772069e56d131401695dd.tar.gz |
Revert "Make literal strings (i.e., returned by `read') read-only."
This reverts commit fb2f8886c4d537b0c7d3e9e78a8d4e5e272a36f4.
The rationale is that `read' must return mutable strings, as reported
by szgyg <szgyg@ludens.elte.hu>.
Diffstat (limited to 'libguile/strings.c')
-rw-r--r-- | libguile/strings.c | 37 |
1 files changed, 9 insertions, 28 deletions
diff --git a/libguile/strings.c b/libguile/strings.c index ffc1eb312..7399d8831 100644 --- a/libguile/strings.c +++ b/libguile/strings.c @@ -218,12 +218,6 @@ get_str_buf_start (SCM *str, SCM *buf, size_t *start) } SCM -scm_i_make_read_only_string (SCM str) -{ - return scm_i_substring_read_only (str, 0, STRING_LENGTH (str)); -} - -SCM scm_i_substring (SCM str, size_t start, size_t end) { SCM buf; @@ -240,28 +234,15 @@ scm_i_substring (SCM str, size_t start, size_t end) SCM scm_i_substring_read_only (SCM str, size_t start, size_t end) { - SCM result; - - if (SCM_UNLIKELY (STRING_LENGTH (str) == 0)) - /* We want the empty string to be `eq?' with the read-only empty - string. */ - result = str; - else - { - SCM buf; - size_t str_start; - - get_str_buf_start (&str, &buf, &str_start); - scm_i_pthread_mutex_lock (&stringbuf_write_mutex); - SET_STRINGBUF_SHARED (buf); - scm_i_pthread_mutex_unlock (&stringbuf_write_mutex); - - result = scm_double_cell (RO_STRING_TAG, SCM_UNPACK (buf), - (scm_t_bits) str_start + start, - (scm_t_bits) end - start); - } - - return result; + SCM buf; + size_t str_start; + get_str_buf_start (&str, &buf, &str_start); + scm_i_pthread_mutex_lock (&stringbuf_write_mutex); + SET_STRINGBUF_SHARED (buf); + scm_i_pthread_mutex_unlock (&stringbuf_write_mutex); + return scm_double_cell (RO_STRING_TAG, SCM_UNPACK(buf), + (scm_t_bits)str_start + start, + (scm_t_bits) end - start); } SCM |