[Guile-commits] 34/58: Add 'scm_to_stringn' shortcut when converting to UTF-8.

[Andy Wingo]

wingo pushed a commit to branch lightning
in repository guile.

commit 25c719b41294176677f82c511e8e1ca50793b18c
Author: Ludovic Courtès <address@hidden>
Date:   Tue Jun 19 14:52:46 2018 +0200

    Add 'scm_to_stringn' shortcut when converting to UTF-8.
    
    * libguile/strings.c (scm_to_stringn): Call 'scm_to_utf8_stringn' when
    ENCODING == "UTF-8".
---
 libguile/strings.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/libguile/strings.c b/libguile/strings.c
index cee64cd..a0a1555 100644
--- a/libguile/strings.c
+++ b/libguile/strings.c
@@ -2177,6 +2177,12 @@ scm_to_stringn (SCM str, size_t *lenp, const char 
*encoding,
 
   if (!scm_is_string (str))
     scm_wrong_type_arg_msg (NULL, 0, str, "string");
+
+  if (c_strcasecmp (encoding, "UTF-8") == 0)
+    /* This is the most common case--e.g., when calling libc bindings
+       while using a UTF-8 locale.  */
+    return scm_to_utf8_stringn (str, lenp);
+
   ilen = scm_i_string_length (str);
 
   if (ilen == 0)