X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=uffi%2Fclsql-uffi.lisp;h=03ce0745359ea36f95816e783f22c114e2ad0167;hb=086019e86cb4328a68b228770d3c0ec91c853794;hp=4f9479d0b1c0f97025ce05a0a7142492757d502b;hpb=e567409d9fff3f7231c2a0bb69b345e19de2b246;p=clsql.git diff --git a/uffi/clsql-uffi.lisp b/uffi/clsql-uffi.lisp index 4f9479d..03ce074 100644 --- a/uffi/clsql-uffi.lisp +++ b/uffi/clsql-uffi.lisp @@ -7,9 +7,7 @@ ;;;; Programmers: Kevin M. Rosenberg ;;;; Date Started: Mar 2002 ;;;; -;;;; $Id$ -;;;; -;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg +;;;; This file, part of CLSQL, is Copyright (c) 2002-2010 by Kevin M. Rosenberg ;;;; ;;;; CLSQL users are granted the rights to distribute and use this software ;;;; as governed by the terms of the Lisp Lesser GNU Public License @@ -143,14 +141,14 @@ (uffi:convert-from-foreign-usb8 char-ptr length) (error "Can't return blob since length is not specified."))) (t - ;; sb-unicode still broken with converting with length, assume + ;; sb-unicode doesn't work converting with length, assume ;; that string is null terminated #+sb-unicode - (uffi:convert-from-foreign-string char-ptr :locale :none) + (uffi:convert-from-foreign-string char-ptr) #-sb-unicode (if length - (uffi:convert-from-foreign-string char-ptr :locale :none + (uffi:convert-from-foreign-string char-ptr :null-terminated-p nil :length length) - (uffi:convert-from-foreign-string char-ptr :locale :none)))))))) + (uffi:convert-from-foreign-string char-ptr))))))))