X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=uffi%2Fclsql-uffi.lisp;h=c12f693368887598e3d41852d317cf446b81c288;hp=1bb9a1a90d0b6085b4d5f3d6d754fb5b4f5e2e80;hb=d9f41af62750c622945bb17b622a39689ee5b840;hpb=e15b72fefebeee46a83d357db2813031edcc6fbd diff --git a/uffi/clsql-uffi.lisp b/uffi/clsql-uffi.lisp index 1bb9a1a..c12f693 100644 --- a/uffi/clsql-uffi.lisp +++ b/uffi/clsql-uffi.lisp @@ -30,7 +30,7 @@ (nreverse new-types)) (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,6 +74,7 @@ (uffi:def-function "atol64" ((str (* :unsigned-char)) (high32 (* :int))) + :module "clsql-uffi" :returning :unsigned-int) (uffi:def-constant +2^32+ 4294967296) @@ -97,7 +98,7 @@ (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 (listp types) + (let ((type (if (consp types) (nth index types) types))) (cond @@ -107,7 +108,7 @@ (case type (:double (atof char-ptr)) - ((or :int32 :int) + ((:int32 :int) (atoi char-ptr)) (:int64 (uffi:with-foreign-object (high32-ptr :int)