r10325: * sql/oodml.lisp: Use explicit database in fault-join-target-slot

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

diff --git a/uffi/clsql-uffi.lisp b/uffi/clsql-uffi.lisp
index d901481dce0dbbe853e997cad73717e911b228c4..76e63eb95ebbc7f43ebc50a742e7dde6d0ae6aae 100644 (file)
--- a/uffi/clsql-uffi.lisp
+++ b/uffi/clsql-uffi.lisp
@@ -57,6 +57,8 @@
              t))
           (:blob
            :blob)
+          (:uint
+           :uint)
           (t
            t))
         new-types))))
@@ -65,6 +67,12 @@
     ((str (* :unsigned-char)))
   :returning :int)
 
+(uffi:def-function ("strtoul" c-strtoul)
+    ((str (* :unsigned-char))
+     (endptr (* :unsigned-char))
+     (radix :int))
+  :returning :unsigned-long)
+
 (uffi:def-function "atol"
     ((str (* :unsigned-char)))
   :returning :long)
@@ -75,7 +83,7 @@
 
 (uffi:def-function "atol64"
     ((str (* :unsigned-char))
-     (high32 (* :int)))
+     (high32 (* :unsigned-int)))
   :module "clsql-uffi"
   :returning :unsigned-int)
 
@@ -97,6 +105,11 @@
 
 (uffi:def-type char-ptr-def (* :unsigned-char))
 
+(defun strtoul (char-ptr)
+  (declare (optimize (speed 3) (safety 0) (space 0))
+          (type char-ptr-def char-ptr))
+  (c-strtoul char-ptr uffi:+null-cstring-pointer+ 10))
+
 (defun convert-raw-field (char-ptr types index &optional length)
   (declare (optimize (speed 3) (safety 0) (space 0))
           (type char-ptr-def char-ptr))
@@ -110,12 +123,18 @@
        (case type
         (:double
          (atof char-ptr))
-        ((:int32 :int)
+        (:int
+         (atol char-ptr))
+        (:int32
          (atoi char-ptr))
-        (:int64
-         (uffi:with-foreign-object (high32-ptr :int)
+        (:uint32
+         (strtoul char-ptr))
+        (:uint
+         (strtoul char-ptr))
+        ((:int64 :uint64)
+         (uffi:with-foreign-object (high32-ptr :unsigned-int)
            (let ((low32 (atol64 char-ptr high32-ptr))
-                 (high32 (uffi:deref-pointer high32-ptr :int)))
+                 (high32 (uffi:deref-pointer high32-ptr :unsigned-int)))
              (if (zerop high32)
                  low32
                (make-64-bit-integer high32 low32)))))
@@ -124,6 +143,11 @@
              (uffi:convert-from-foreign-usb8 char-ptr length)
            (error "Can't return blob since length is not specified.")))
         (t
+         ;; sb-unicode still broken with converting with length, assume
+         ;; that string is null terminated
+         #+sb-unicode
+         (uffi:convert-from-foreign-string char-ptr :locale :none)
+         #-sb-unicode
           (if length
              (uffi:convert-from-foreign-string char-ptr :locale :none
                                                 :null-terminated-p nil