diff options
author | Ludovic Courtès <ludo@gnu.org> | 2008-10-11 19:25:54 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2008-10-11 19:25:54 +0200 |
commit | 074f69cdf2712420e9f1ab0ee382835ac9e9c12a (patch) | |
tree | 6952f79287269bc870ef7592d0c2294ff943cbbd /libguile/strings.c | |
parent | 2956b07140da269fada704dab16d99cfd81f7d0a (diff) | |
parent | 88cefbc7de86e0061b0cc4fb5417de78f7afba15 (diff) | |
download | guile-074f69cdf2712420e9f1ab0ee382835ac9e9c12a.tar.gz |
Merge branch 'master' into boehm-demers-weiser-gc
Conflicts:
libguile/Makefile.am
libguile/threads.c
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 47a5cfe62..960f6998a 100644 --- a/libguile/strings.c +++ b/libguile/strings.c @@ -205,12 +205,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; @@ -227,28 +221,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 |