r1592: Updated to 0.2.10

[uffi.git] / src / strings.cl

diff --git a/src/strings.cl b/src/strings.cl
index 0d1844e301eb05eb4fc4931e3ee0e25d8e032ff8..5a4b5671b291f92c271bb7c345a99e9d071ac6b2 100644 (file)
--- a/src/strings.cl
+++ b/src/strings.cl
@@ -1,4 +1,4 @@
-;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
+;;;; -*- Mode: ANSI-Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*-
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: strings.cl,v 1.5 2002/03/14 21:03:12 kevin Exp $
+;;;; $Id: strings.cl,v 1.8 2002/03/19 16:42:59 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -23,7 +23,7 @@
 (def-constant +null-cstring-pointer+
     #+cmu nil
     #+allegro 0
-    #+lispworks (fli:make-pointer :address 0 :type :char))
+    #+lispworks (fli:make-pointer :address 0 :type '(:unsigned :char)))
 
 (defmacro convert-from-cstring (obj)
   "Converts a string from a c-call. Same as convert-from-foreign-string, except
@@ -46,14 +46,12 @@ that CMU automatically converts strings from c-calls."
 (defmacro convert-to-cstring (obj)
   #+lispworks
   `(if (null ,obj)
-       +null-cstring-pointer+
-     (fli:make-pointer
-      :address (fli:pointer-address (fli:convert-to-foreign-string ,obj))
-      :type :char))
+    +null-cstring-pointer+
+    (fli:convert-to-foreign-string ,obj))
   #+allegro
   `(if (null ,obj)
-       0
-     (values (excl:string-to-native ,obj)))
+    0
+    (values (excl:string-to-native ,obj)))
   #+cmu
   (declare (ignore obj))
   )
@@ -98,9 +96,7 @@ that CMU automatically converts strings from c-calls."
   #+lispworks
   `(if (null ,obj)
        +null-cstring-pointer+
-     (fli:make-pointer
-      :address (fli:pointer-address (fli:convert-to-foreign-string ,obj))
-      :type :char))
+    (fli:convert-to-foreign-string ,obj))
   #+allegro
   `(if (null ,obj)
        0
@@ -111,18 +107,19 @@ that CMU automatically converts strings from c-calls."
        (i (gensym)))
     `(when (stringp ,obj)
        (let* ((,size (length ,obj))
-             (,storage (alien:make-alien char (1+ ,size))))
-        (setq ,storage (alien:cast ,storage (* char)))
-        (dotimes (,i ,size)
-          (declare (fixnum ,i)
-                   (optimize (speed 3) (safety 0)))
-          (setf (alien:deref ,storage ,i) (char-code (char ,obj ,i))))
-        (setf (alien:deref ,storage ,size) 0)
+             (,storage (alien:make-alien (alien:unsigned 8) (1+ ,size))))
+        (setq ,storage (alien:cast ,storage (* (alien:unsigned 8))))
+        (locally
+            (declare (optimize (speed 3) (safety 0)))
+          (dotimes (,i ,size)
+            (declare (fixnum ,i))
+            (setf (alien:deref ,storage ,i) (char-code (char ,obj ,i))))
+          (setf (alien:deref ,storage ,size) 0))
         ,storage)))
   )
 
 
-(defmacro allocate-foreign-string (size &key (unsigned nil))
+(defmacro allocate-foreign-string (size &key (unsigned t))
   #+cmu
   (let ((array-def (gensym)))
     `(let ((,array-def (list 'alien:array 'c-call:char ,size)))