[Guile-commits] 05/09: iprin1 uses scm_c_put_string

[Andy Wingo]

wingo pushed a commit to branch master
in repository guile.

commit 934b6dc398ad1875768e503c9e779d5c1f1db774
Author: Andy Wingo <address@hidden>
Date:   Mon May 30 15:05:40 2016 +0200

    iprin1 uses scm_c_put_string
    
    * libguile/print.c (iprin1): Use scm_c_put_string for strings.
    * test-suite/test-suite/lib.scm (exception:encoding-error): Add an
      additional expected error string for `encoding-error'.
---
 libguile/print.c              |    7 ++-----
 test-suite/test-suite/lib.scm |    2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/libguile/print.c b/libguile/print.c
index 4b6470e..519393c 100644
--- a/libguile/print.c
+++ b/libguile/print.c
@@ -717,7 +717,7 @@ iprin1 (SCM exp, SCM port, scm_print_state *pstate)
          {
            size_t len, printed;
 
-           len = scm_i_string_length (exp);
+           printed = len = scm_i_string_length (exp);
            if (SCM_WRITINGP (pstate))
              {
                printed = write_string (scm_i_string_data (exp),
@@ -727,10 +727,7 @@ iprin1 (SCM exp, SCM port, scm_print_state *pstate)
                len += 2;                   /* account for the quotes */
              }
            else
-             printed = display_string (scm_i_string_data (exp),
-                                       scm_i_is_narrow_string (exp),
-                                       len, port,
-                                       PORT_CONVERSION_HANDLER (port));
+              scm_c_put_string (port, exp, 0, len);
 
            if (SCM_UNLIKELY (printed < len))
              scm_encoding_error (__func__, errno,
diff --git a/test-suite/test-suite/lib.scm b/test-suite/test-suite/lib.scm
index 27620a7..5b73bda 100644
--- a/test-suite/test-suite/lib.scm
+++ b/test-suite/test-suite/lib.scm
@@ -287,7 +287,7 @@
 (define exception:system-error
   (cons 'system-error ".*"))
 (define exception:encoding-error
-  (cons 'encoding-error "(cannot convert.* to output locale|input (locale 
conversion|decoding) error)"))
+  (cons 'encoding-error "(cannot convert.* to output locale|input (locale 
conversion|decoding) error|conversion to port encoding failed)"))
 (define exception:miscellaneous-error
   (cons 'misc-error "^.*"))
 (define exception:read-error