X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=uffi%2Fclsql-uffi.lisp;fp=uffi%2Fclsql-uffi.lisp;h=76e63eb95ebbc7f43ebc50a742e7dde6d0ae6aae;hp=7ac28c00e7f8c54418fde9f8459d5433e9557b4b;hb=38e68ca9528898217add34a81afa210073ba0340;hpb=3725c24dbf01d1f7ff8eacab7844e922dc74c4f5

diff --git a/uffi/clsql-uffi.lisp b/uffi/clsql-uffi.lisp
index 7ac28c0..76e63eb 100644
--- 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)
@@ -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,9 +123,15 @@
        (case type
 	 (:double
 	  (atof char-ptr))
-	 ((:int32 :int)
+	 (:int
+	  (atol char-ptr))
+	 (:int32
 	  (atoi char-ptr))
-	 (:int64
+	 (: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 :unsigned-int)))