r2037: Debian build

[clsql.git] / interfaces / clsql-uffi / clsql-uffi.cl

diff --git a/interfaces/clsql-uffi/clsql-uffi.cl b/interfaces/clsql-uffi/clsql-uffi.cl
index 27059e28b509b5057c251818cd55d37a3fe74a57..eddd6cde90cea23eff226b947d1cf6a37baa0aca 100644 (file)
--- a/interfaces/clsql-uffi/clsql-uffi.cl
+++ b/interfaces/clsql-uffi/clsql-uffi.cl
@@ -7,7 +7,7 @@
 ;;;; Programmers:   Kevin M. Rosenberg
 ;;;; Date Started:  Mar 2002
 ;;;;
-;;;; $Id: clsql-uffi.cl,v 1.1 2002/03/27 07:58:42 kevin Exp $
+;;;; $Id: clsql-uffi.cl,v 1.4 2002/03/29 14:03:27 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -20,18 +20,38 @@
 (in-package :clsql-uffi)
 
 
-(defun canonicalize-type-list (types num-fields)
+(defun canonicalize-type-list (types auto-list)
   "Ensure a field type list meets expectations"
   (let ((length-types (length types))
        (new-types '()))
-    (loop for i from 0 below num-fields
+    (loop for i from 0 below (length auto-list)
          do
          (if (>= i length-types)
              (push t new-types) ;; types is shorted than num-fields
              (push
               (case (nth i types)
-                ((:int :long :double :longlong t)
-                 (nth i types))
+                (:int
+                 (case (nth i auto-list)
+                   (:int32
+                    :int32)
+                   (:int64
+                    :int64)
+                   (t
+                    t)))
+                (:double
+                 (case (nth i auto-list)
+                   (:double
+                    :double)
+                   (t
+                    t)))
+                (:int32
+                 (if (eq :int32 (nth i auto-list))
+                     :int32
+                   t))
+                (:int64
+                 (if (eq :int64 (nth i auto-list))
+                     :int64
+                   t))
                 (t
                  t))
               new-types)))
@@ -52,7 +72,7 @@
 (uffi:def-function "atol64"
     ((str (* :unsigned-char))
      (high32 (* :int)))
-  :returning :int)
+  :returning :unsigned-int)
 
 (uffi:def-constant +2^32+ 4294967296)
 (uffi:def-constant +2^32-1+ (1- +2^32+))
@@ -68,18 +88,16 @@
                  (nth index types)
                  types)))
     (case type
-      (:int
-       (atoi char-ptr))
-      (:long
-       (atol char-ptr))
       (:double
        (atof char-ptr))
-      (:longlong
+      ((or :int32 :int)
+       (atoi char-ptr))
+      (:int64
        (uffi:with-foreign-object (high32-ptr :int)
         (let ((low32 (atol64 char-ptr high32-ptr))
               (high32 (uffi:deref-pointer high32-ptr :int)))
           (if (zerop high32)
               low32
               (make-64-bit-integer high32 low32)))))
-      (otherwise
+      (t
        (uffi:convert-from-foreign-string char-ptr)))))