diff options
author | Ludovic Courtès <ludo@gnu.org> | 2011-02-02 17:38:03 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2011-02-02 18:06:29 +0100 |
commit | 6851d3be80bef46993e192b0f4ea708248f97921 (patch) | |
tree | d941bdb5be27848c5b1366e66ad688d1eedb6833 /libguile/strings.h | |
parent | 7174bc08ddd6cc64f2ea321910042cf2233d586a (diff) | |
download | guile-6851d3be80bef46993e192b0f4ea708248f97921.tar.gz |
Change `scm_encoding_error' to pass the port and faulty character.
* libguile/strings.c (scm_encoding_error): Remove the `from', `to', and
`string_or_bv' parameters; add `port' and `chr'.
(scm_to_stringn): Update accordingly.
* libguile/strings.h (scm_encoding_error): Update accordingly.
* libguile/ports.c (scm_ungetc): Update accordingly.
* libguile/print.c (iprin1, scm_write_char): Update accordingly.
* test-suite/tests/encoding-escapes.test ("display output
errors")["ultima", "Rashomon"]: Check the arguments of
`encoding-error'.
["tekniko"]: New test.
* test-suite/tests/ports.test ("string ports")["wrong encoding"]: Adjust
to new `encoding-error' arguments.
Diffstat (limited to 'libguile/strings.h')
-rw-r--r-- | libguile/strings.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libguile/strings.h b/libguile/strings.h index 329e6c185..ed3a067c2 100644 --- a/libguile/strings.h +++ b/libguile/strings.h @@ -211,9 +211,7 @@ SCM_INTERNAL int scm_i_try_narrow_string (SCM str); SCM_INTERNAL SCM scm_i_symbol_substring (SCM sym, size_t start, size_t end); SCM_INTERNAL scm_t_wchar scm_i_symbol_ref (SCM sym, size_t x); SCM_INTERNAL void scm_encoding_error (const char *subr, int err, - const char *message, - const char *from, const char *to, - SCM string_or_bv); + const char *message, SCM port, SCM chr); SCM_INTERNAL void scm_decoding_error (const char *subr, int err, const char *message, SCM port); |