projects
/
clsql.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r10376: 03 Apr 2005 Kevin Rosenberg <kevin@rosenberg.net>
[clsql.git]
/
uffi
/
clsql-uffi.lisp
diff --git
a/uffi/clsql-uffi.lisp
b/uffi/clsql-uffi.lisp
index 6e7784917d9a97cc2bd68fa427e9c2981926eeed..76e63eb95ebbc7f43ebc50a742e7dde6d0ae6aae 100644
(file)
--- a/
uffi/clsql-uffi.lisp
+++ b/
uffi/clsql-uffi.lisp
@@
-57,6
+57,8
@@
t))
(:blob
:blob)
t))
(:blob
:blob)
+ (:uint
+ :uint)
(t
t))
new-types))))
(t
t))
new-types))))
@@
-65,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)
@@
-97,6
+105,11
@@
(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))
@@
-110,9
+123,15
@@
(case type
(:double
(atof char-ptr))
(case type
(:double
(atof char-ptr))
- ((:int32 :int)
+ (:int
+ (atol char-ptr))
+ (:int32
(atoi char-ptr))
(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)))
(uffi:with-foreign-object (high32-ptr :unsigned-int)
(let ((low32 (atol64 char-ptr high32-ptr))
(high32 (uffi:deref-pointer high32-ptr :unsigned-int)))
@@
-124,6
+143,11
@@
(uffi:convert-from-foreign-usb8 char-ptr length)
(error "Can't return blob since length is not specified.")))
(t
(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
(if length
(uffi:convert-from-foreign-string char-ptr :locale :none
:null-terminated-p nil