r9396: add ensure-char-storage function, new tests

[uffi.git] / src / strings.lisp

diff --git a/src/strings.lisp b/src/strings.lisp
index 0f01e97ba1245103f0c8f8b5affaaa3f0ef019dc..89c41b2ec03a8ca4d240d449a134c33c92c2a2ef 100644 (file)
--- a/src/strings.lisp
+++ b/src/strings.lisp
@@ -157,10 +157,11 @@ that LW/CMU automatically converts strings from c-calls."
        nil
      (if (eq ,locale :none)
         (fast-native-to-string ,obj ,length)
-       (excl:native-to-string
-       ,obj 
-       ,@(when length (list :length length))
-       :truncate (not ,null-terminated-p))))
+       (values
+       (excl:native-to-string
+        ,obj 
+        ,@(when length (list :length length))
+        :truncate (not ,null-terminated-p)))))
   #+lispworks
   `(if (fli:null-pointer-p ,obj)
        nil