diff options
author | Michael Gran <spk121@yahoo.com> | 2009-09-09 08:07:53 -0700 |
---|---|---|
committer | Michael Gran <spk121@yahoo.com> | 2009-09-09 08:07:53 -0700 |
commit | f7f4d0477e2f67f0c1248da5d6e64044019196a3 (patch) | |
tree | 334a45969ee86f48b9a58865a52b59d4ee8fbd72 /libguile/strings.c | |
parent | 0d05ae7c4b1eddf6257f99f44eaf5cb7b11191be (diff) | |
download | guile-f7f4d0477e2f67f0c1248da5d6e64044019196a3.tar.gz |
Make scm_i_from_stringn into API for use with libguilereadline
* libguile/strings.c (scm_i_from_stringn): renamed to scm_from_stringn.
All callers changed.
* libguile/strings.h: change declaration of scm_i_from_stringn to
scm_from_stringn
* libguile/strports.c (scm_strport_to_string): scm_i_from_stringn ->
scm_from_stringn
* guile-readline/readline.c (internal_readline): scm_i_from_stringn ->
scm_from_stringn
Diffstat (limited to 'libguile/strings.c')
-rw-r--r-- | libguile/strings.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libguile/strings.c b/libguile/strings.c index 06e3359d4..5784a0324 100644 --- a/libguile/strings.c +++ b/libguile/strings.c @@ -1478,8 +1478,8 @@ scm_is_string (SCM obj) } SCM -scm_i_from_stringn (const char *str, size_t len, const char *encoding, - scm_t_string_failed_conversion_handler handler) +scm_from_stringn (const char *str, size_t len, const char *encoding, + scm_t_string_failed_conversion_handler handler) { size_t u32len, i; scm_t_wchar *u32; @@ -1578,7 +1578,7 @@ scm_from_locale_stringn (const char *str, size_t len) hndl = SCM_FAILED_CONVERSION_ERROR; } - return scm_i_from_stringn (str, len, enc, hndl); + return scm_from_stringn (str, len, enc, hndl); } SCM @@ -1593,7 +1593,7 @@ scm_from_locale_string (const char *str) SCM scm_i_from_utf8_string (const scm_t_uint8 *str) { - return scm_i_from_stringn ((const char *) str, + return scm_from_stringn ((const char *) str, strlen ((char *) str), "UTF-8", SCM_FAILED_CONVERSION_ERROR); } |