r9471: 5 May 2004 Kevin Rosenberg <kevin@rosenberg.net>

[clsql.git] / uffi / clsql-uffi.lisp

diff --git a/uffi/clsql-uffi.lisp b/uffi/clsql-uffi.lisp
index 4093cfcb642285d0ff543fbb3cea400f6d23d854..63267022dc7ce8c7710b36edee0c395907ce35d8 100644 (file)
--- a/uffi/clsql-uffi.lisp
+++ b/uffi/clsql-uffi.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmers:   Kevin M. Rosenberg
 ;;;; Date Started:  Mar 2002
 ;;;;
-;;;; $Id: clsql-uffi.lisp,v 1.31 2003/06/15 13:50:24 kevin Exp $
+;;;; $Id$
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -21,14 +21,14 @@
 
 (defun canonicalize-type-list (types auto-list)
   "Ensure a field type list meets expectations"
-  (declaim (optimize (speed 3) (safety 0)))
+  (declare (optimize (speed 3) (safety 0)))
   (do ((i 0 (1+ i))
        (new-types '())
        (length-types (length types))
        (length-auto-list (length auto-list)))
       ((= i length-auto-list)
        (nreverse new-types))
-    (declaim (fixnum length-types length-auto-list i))
+    (declare (fixnum length-types length-auto-list i))
     (if (>= i length-types)
        (push t new-types) ;; types is shorted than num-fields
        (push
@@ -87,24 +87,14 @@
 
 (uffi:def-type char-ptr-def (* :unsigned-char))
 
-(defun char-ptr-points-to-null (char-ptr)
-  "Returns T if foreign character pointer refers to 'NULL' string. Only called for numeric entries"
-  ;; Uses short cut and returns T if first character is #\N. It should
-  ;; never be non-numeric
-  (declare (type char-ptr-def char-ptr))
-  (or (uffi:null-pointer-p char-ptr) 
-      (char-equal #\N (uffi:ensure-char-character
-                      (uffi:deref-pointer char-ptr :char)))))
-    
-(defun convert-raw-field (char-ptr types index)
-  (declare (optimize (speed 3) (safety 0) (space 0)))
+(defun convert-raw-field (char-ptr types index &optional length)
+  (declare (optimize (speed 3) (safety 0) (space 0))
+          (type char-ptr-def char-ptr))
   (let ((type (if (listp types)
                  (nth index types)
                  types)))
     (cond
-      ((and (or (eq type :double) (eq type :int32) (eq type :int)
-               (eq type :int64))
-           (char-ptr-points-to-null char-ptr))
+      ((uffi:null-pointer-p char-ptr)
        nil)
       (t
        (case type
@@ -120,5 +110,9 @@
                  low32
                  (make-64-bit-integer high32 low32)))))
         (t
-         (uffi:convert-from-foreign-string char-ptr :locale :none)))))))
-  
+          (if length
+             (uffi:convert-from-foreign-string char-ptr :locale :none
+                                                :null-terminated-p nil
+                                                :length length)
+            (uffi:convert-from-foreign-string char-ptr :locale :none))))))))
+