projects
/
clsql.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r11509: fix number of arguments to handler-case :no-error form
[clsql.git]
/
uffi
/
clsql-uffi.lisp
diff --git
a/uffi/clsql-uffi.lisp
b/uffi/clsql-uffi.lisp
index 1bb9a1a90d0b6085b4d5f3d6d754fb5b4f5e2e80..76e63eb95ebbc7f43ebc50a742e7dde6d0ae6aae 100644
(file)
--- 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)
(nreverse new-types))
(declare (fixnum length-types length-auto-list i))
(if (>= i length-types)
- (push t new-types) ;; types is shorte
d
than num-fields
+ (push t new-types) ;; types is shorte
r
than num-fields
(push
(case (nth i types)
(:int
(push
(case (nth i types)
(:int
@@
-54,7
+54,11
@@
(:int64
(if (eq :int64 (nth i auto-list))
:int64
(:int64
(if (eq :int64 (nth i auto-list))
:int64
- t))
+ t))
+ (:blob
+ :blob)
+ (:uint
+ :uint)
(t
t))
new-types))))
(t
t))
new-types))))
@@
-63,6
+67,12
@@
((str (* :unsigned-char)))
:returning :int)
((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 "atol"
((str (* :unsigned-char)))
:returning :long)
@@
-73,7
+83,8
@@
(uffi:def-function "atol64"
((str (* :unsigned-char))
(uffi:def-function "atol64"
((str (* :unsigned-char))
- (high32 (* :int)))
+ (high32 (* :unsigned-int)))
+ :module "clsql-uffi"
:returning :unsigned-int)
(uffi:def-constant +2^32+ 4294967296)
:returning :unsigned-int)
(uffi:def-constant +2^32+ 4294967296)
@@
-94,10
+105,15
@@
(uffi:def-type char-ptr-def (* :unsigned-char))
(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))
(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 (
list
p types)
+ (let ((type (if (
cons
p types)
(nth index types)
types)))
(cond
(nth index types)
types)))
(cond
@@
-107,16
+123,31
@@
(case type
(:double
(atof char-ptr))
(case type
(:double
(atof char-ptr))
- ((or :int32 :int)
+ (:int
+ (atol char-ptr))
+ (:int32
(atoi char-ptr))
(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))
(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
(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
(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
(if length
(uffi:convert-from-foreign-string char-ptr :locale :none
:null-terminated-p nil