r10077: * multiple: Apply patch from Joerg Hoehle with multiple

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

diff --git a/uffi/clsql-uffi.lisp b/uffi/clsql-uffi.lisp
index aa62e6c993c27b3181c47f89effa75847acddedc..c12f693368887598e3d41852d317cf446b81c288 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.30 2003/06/08 12:48:55 kevin Exp $
+;;;; $Id$
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -21,16 +21,16 @@
 
 (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 t new-types) ;; types is shorter than num-fields
        (push
         (case (nth i types)
           (:int
@@ -74,42 +74,41 @@
 (uffi:def-function "atol64"
     ((str (* :unsigned-char))
      (high32 (* :int)))
+  :module "clsql-uffi"
   :returning :unsigned-int)
 
 (uffi:def-constant +2^32+ 4294967296)
+(uffi:def-constant +2^64+ 18446744073709551616)
 (uffi:def-constant +2^32-1+ (1- +2^32+))
 
 (defmacro make-64-bit-integer (high32 low32)
-  `(+ ,low32 (ash ,high32 32)))
+  `(if (zerop (ldb (byte 1 31) ,high32))
+       (+ ,low32 (ash ,high32 32))
+     (- (+ ,low32 (ash ,high32 32)) +2^64+)))
+
+;; From high to low ints
+(defmacro make-128-bit-integer (a b c d)
+  `(+ ,d (ash ,c 32) (ash ,b 64) (ash ,a 96)))
 
 (defmacro split-64-bit-integer (int64)
   `(values (ash ,int64 -32) (logand ,int64 +2^32-1+)))
 
 (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)))
-  (let ((type (if (listp types)
+(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 (consp 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
         (:double
          (atof char-ptr))
-        ((or :int32 :int)
+        ((:int32 :int)
          (atoi char-ptr))
         (:int64
          (uffi:with-foreign-object (high32-ptr :int)
@@ -119,5 +118,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))))))))
+