[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.7-29-ge211d6
From: |
Andy Wingo |
Subject: |
[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.7-29-ge211d69 |
Date: |
Tue, 15 Jan 2013 15:41:35 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".
http://git.savannah.gnu.org/cgit/guile.git/commit/?id=e211d69d9dcb057d3c49c1d94c02894ddd19a215
The branch, stable-2.0 has been updated
via e211d69d9dcb057d3c49c1d94c02894ddd19a215 (commit)
from 581f410fbd803721eb750ed8e7d6ec4cc4bcda79 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit e211d69d9dcb057d3c49c1d94c02894ddd19a215
Author: Andy Wingo <address@hidden>
Date: Tue Jan 15 15:08:20 2013 +0100
fix string->bytevector for utf-8 and non-error conversion strategies
* module/ice-9/iconv.scm (call-with-encoded-output-string):
(string->bytevector, bytevector->string): Only call string->utf8 and
utf8->string if the conversion strategy is `error'.
-----------------------------------------------------------------------
Summary of changes:
module/ice-9/iconv.scm | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/module/ice-9/iconv.scm b/module/ice-9/iconv.scm
index a8b7458..88af90d 100644
--- a/module/ice-9/iconv.scm
+++ b/module/ice-9/iconv.scm
@@ -47,7 +47,8 @@
(conversion-strategy 'error))
"Call PROC on a fresh port. Encode the resulting string as a
bytevector according to ENCODING, and return the bytevector."
- (if (string-ci=? encoding "utf-8")
+ (if (and (string-ci=? encoding "utf-8")
+ (eq? conversion-strategy 'error))
;; I don't know why, but this appears to be faster; at least for
;; serving examples/debug-sxml.scm (1464 reqs/s versus 850
;; reqs/s).
@@ -66,7 +67,8 @@ bytevector according to ENCODING, and return the bytevector."
#:optional (conversion-strategy 'error))
"Encode STRING according to ENCODING, which should be a string naming
a character encoding, like \"utf-8\"."
- (if (string-ci=? encoding "utf-8")
+ (if (and (string-ci=? encoding "utf-8")
+ (eq? conversion-strategy 'error))
(string->utf8 str)
(call-with-encoded-output-string
encoding
@@ -79,7 +81,8 @@ a character encoding, like \"utf-8\"."
"Decode the string represented by BV. The bytes in the bytevector
will be interpreted according to ENCODING, which should be a string
naming a character encoding, like \"utf-8\"."
- (if (string-ci=? encoding "utf-8")
+ (if (and (string-ci=? encoding "utf-8")
+ (eq? conversion-strategy 'error))
(utf8->string bv)
(let ((p (open-bytevector-input-port bv)))
(set-port-encoding! p encoding)
hooks/post-receive
--
GNU Guile
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.7-29-ge211d69,
Andy Wingo <=