t))
(:blob
:blob)
+ (:uint
+ :uint)
(t
t))
new-types))))
((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)
(uffi:def-function "atol64"
((str (* :unsigned-char))
- (high32 (* :int)))
+ (high32 (* :unsigned-int)))
:module "clsql-uffi"
:returning :unsigned-int)
(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))
(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)))))
(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