[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Guile-commits] 01/01: Add 'scm_to_stringn' shortcut when converting to
From: |
Ludovic Courtès |
Subject: |
[Guile-commits] 01/01: Add 'scm_to_stringn' shortcut when converting to UTF-8. |
Date: |
Wed, 20 Jun 2018 03:20:21 -0400 (EDT) |
civodul pushed a commit to branch stable-2.2
in repository guile.
commit 4f64bcd4d146618154d50202fc73d7083bf9b26a
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 | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/libguile/strings.c b/libguile/strings.c
index 5c49e33..5f35617 100644
--- a/libguile/strings.c
+++ b/libguile/strings.c
@@ -1,5 +1,5 @@
/* Copyright (C) 1995, 1996, 1998, 2000, 2001, 2004, 2006,
- * 2008-2016 Free Software Foundation, Inc.
+ * 2008-2016, 2018 Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -2172,6 +2172,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)