X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=uffi%2Fclsql-uffi.lisp;h=331db7d3ab795d3f974dc09f834ca180f452532b;hb=508c4b5bfa6d1bf0cc8434bc991c14395493a7f0;hp=aa62e6c993c27b3181c47f89effa75847acddedc;hpb=20e845656e846b8f48c6243c9ef7211a434a034f;p=clsql.git

diff --git a/uffi/clsql-uffi.lisp b/uffi/clsql-uffi.lisp
index aa62e6c..331db7d 100644
--- 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.30 2003/06/08 12:48:55 kevin Exp $
+;;;; $Id$
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -21,7 +21,7 @@
 
 (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))
@@ -87,23 +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))
-  (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
@@ -119,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))))))))
+