diff options
| author | Andy Wingo <wingo@pobox.com> | 2016-04-22 21:45:55 +0200 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2016-04-23 21:53:54 +0200 |
| commit | cd83872df8c495f1f5a4aa304dfb9b2d99ce5b22 (patch) | |
| tree | 2e0628db81a1556e050c0844618f81b06fe99c17 /libguile/rdelim.c | |
| parent | 9632b24c4d6ee24a4672cdf0907364d26adb4bd9 (diff) | |
| download | guile-cd83872df8c495f1f5a4aa304dfb9b2d99ce5b22.tar.gz | |
Replace scm_getc with scm_getc_unlocked
* libguile/ports.h (scm_getc_unlocked): Remove, or rather rename to
scm_getc. This probably introduces some thread-related bugs but we'll
fix them in a different way.
* libguile/ports.c (scm_getc): Rename from scm_getc_unlocked, replacing
the locky implementation.
(scm_read_char): Use scm_getc.
* libguile/r6rs-ports.c (scm_get_string_n_x): Use scm_getc.
* libguile/rdelim.c (scm_read_delimited_x, scm_read_line): Use
scm_getc.
* libguile/read.c: Use scm_getc.
Diffstat (limited to 'libguile/rdelim.c')
| -rw-r--r-- | libguile/rdelim.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libguile/rdelim.c b/libguile/rdelim.c index c8c7d8b43..14955a972 100644 --- a/libguile/rdelim.c +++ b/libguile/rdelim.c @@ -79,7 +79,7 @@ SCM_DEFINE (scm_read_delimited_x, "%read-delimited!", 3, 3, 0, { size_t k; - c = scm_getc_unlocked (port); + c = scm_getc (port); for (k = 0; k < num_delims; k++) { if (scm_i_string_ref (delims, k) == c) @@ -149,7 +149,7 @@ SCM_DEFINE (scm_read_line, "%read-line", 0, 1, 0, } else { - buf[index] = scm_getc_unlocked (port); + buf[index] = scm_getc (port); switch (buf[index]) { case EOF: |