From 25752c4d1cef1049578d6b9b2cd0b6e44b8b8de7 Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Sat, 31 Aug 2013 10:57:11 +0200 Subject: [PATCH] Faster scm_from_port_stringn * libguile/strings.c (scm_from_port_stringn): Always inline to scm_from_utf8_string if the byte sequence is valid utf-8. --- libguile/strings.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libguile/strings.c b/libguile/strings.c index fa97a0057..8ee909bca 100644 --- a/libguile/strings.c +++ b/libguile/strings.c @@ -1740,7 +1740,8 @@ scm_from_port_stringn (const char *str, size_t len, SCM port) if (pti->encoding_mode == SCM_PORT_ENCODING_MODE_LATIN1) return scm_from_latin1_stringn (str, len); else if (pti->encoding_mode == SCM_PORT_ENCODING_MODE_UTF8 - && pt->ilseq_handler == SCM_FAILED_CONVERSION_ERROR) + && (pt->ilseq_handler == SCM_FAILED_CONVERSION_ERROR + || (u8_check ((uint8_t *) str, len) == NULL))) return scm_from_utf8_stringn (str, len); else return scm_from_stringn (str, len, pt->encoding, pt->ilseq_handler);