X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=uffi%2Fclsql-uffi.lisp;h=6e7784917d9a97cc2bd68fa427e9c2981926eeed;hb=e7d3c396e803dc0dcc5acb773de5c872568c66e3;hp=c12f693368887598e3d41852d317cf446b81c288;hpb=d9f41af62750c622945bb17b622a39689ee5b840;p=clsql.git

diff --git a/uffi/clsql-uffi.lisp b/uffi/clsql-uffi.lisp
index c12f693..6e77849 100644
--- a/uffi/clsql-uffi.lisp
+++ b/uffi/clsql-uffi.lisp
@@ -54,7 +54,9 @@
 	   (:int64
 	    (if (eq :int64 (nth i auto-list))
 		:int64
-		t))
+	      t))
+	   (:blob
+	    :blob)
 	   (t
 	    t))
 	 new-types))))
@@ -73,7 +75,7 @@
 
 (uffi:def-function "atol64"
     ((str (* :unsigned-char))
-     (high32 (* :int)))
+     (high32 (* :unsigned-int)))
   :module "clsql-uffi"
   :returning :unsigned-int)
 
@@ -111,12 +113,16 @@
 	 ((:int32 :int)
 	  (atoi char-ptr))
 	 (:int64
-	  (uffi:with-foreign-object (high32-ptr :int)
+	  (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)))))
+		(make-64-bit-integer high32 low32)))))
+	 (:blob
+	  (if length
+	      (uffi:convert-from-foreign-usb8 char-ptr length)
+	    (error "Can't return blob since length is not specified.")))
 	 (t
           (if length
 	      (uffi:convert-from-foreign-string char-ptr :locale :none