summaryrefslogtreecommitdiff
path: root/libguile/rdelim.c
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2009-08-25 21:43:00 +0200
committerAndy Wingo <wingo@pobox.com>2009-08-25 21:43:00 +0200
commitc6a1380bde978194ee5c533246285f6af4bbb554 (patch)
tree81bb98421030e83688331b8a12b52bd93de7b403 /libguile/rdelim.c
parent108e18b18abc066b2709a09283751e9138ccc935 (diff)
parent889975e51accb80491af76fc5db980aeb3edd342 (diff)
downloadguile-c6a1380bde978194ee5c533246285f6af4bbb554.tar.gz
Merge commit 'origin/master'
Conflicts: libguile/unif.c
Diffstat (limited to 'libguile/rdelim.c')
-rw-r--r--libguile/rdelim.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/libguile/rdelim.c b/libguile/rdelim.c
index 04a0944f4..1f46e5bf0 100644
--- a/libguile/rdelim.c
+++ b/libguile/rdelim.c
@@ -59,12 +59,10 @@ SCM_DEFINE (scm_read_delimited_x, "%read-delimited!", 3, 3, 0,
size_t j;
size_t cstart;
size_t cend;
- int c;
- const char *cdelims;
+ scm_t_wchar c;
size_t num_delims;
SCM_VALIDATE_STRING (1, delims);
- cdelims = scm_i_string_chars (delims);
num_delims = scm_i_string_length (delims);
SCM_VALIDATE_STRING (2, str);
@@ -83,7 +81,7 @@ SCM_DEFINE (scm_read_delimited_x, "%read-delimited!", 3, 3, 0,
c = scm_getc (port);
for (k = 0; k < num_delims; k++)
{
- if (cdelims[k] == c)
+ if (scm_i_string_ref (delims, k) == c)
{
if (scm_is_false (gobble))
scm_ungetc (c, port);