projects
/
clsql.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r9372: further uffi porting
[clsql.git]
/
uffi
/
clsql-uffi.lisp
diff --git
a/uffi/clsql-uffi.lisp
b/uffi/clsql-uffi.lisp
index da5276afaba79926e8da8a89fc13091bd45e5041..63267022dc7ce8c7710b36edee0c395907ce35d8 100644
(file)
--- a/
uffi/clsql-uffi.lisp
+++ b/
uffi/clsql-uffi.lisp
@@
-21,14
+21,14
@@
(defun canonicalize-type-list (types auto-list)
"Ensure a field type list meets expectations"
(defun canonicalize-type-list (types auto-list)
"Ensure a field type list meets expectations"
- (decla
im
(optimize (speed 3) (safety 0)))
+ (decla
re
(optimize (speed 3) (safety 0)))
(do ((i 0 (1+ i))
(new-types '())
(length-types (length types))
(length-auto-list (length auto-list)))
((= i length-auto-list)
(nreverse new-types))
(do ((i 0 (1+ i))
(new-types '())
(length-types (length types))
(length-auto-list (length auto-list)))
((= i length-auto-list)
(nreverse new-types))
- (decla
im
(fixnum length-types length-auto-list i))
+ (decla
re
(fixnum length-types length-auto-list i))
(if (>= i length-types)
(push t new-types) ;; types is shorted than num-fields
(push
(if (>= i length-types)
(push t new-types) ;; types is shorted than num-fields
(push
@@
-87,9
+87,9
@@
(uffi:def-type char-ptr-def (* :unsigned-char))
(uffi:def-type char-ptr-def (* :unsigned-char))
-(defun convert-raw-field (char-ptr types index)
+(defun convert-raw-field (char-ptr types index
&optional length
)
(declare (optimize (speed 3) (safety 0) (space 0))
(declare (optimize (speed 3) (safety 0) (space 0))
- (type char-ptr-def char-ptr))
+ (type char-ptr-def char-ptr))
(let ((type (if (listp types)
(nth index types)
types)))
(let ((type (if (listp types)
(nth index types)
types)))
@@
-110,5
+110,9
@@
low32
(make-64-bit-integer high32 low32)))))
(t
low32
(make-64-bit-integer high32 low32)))))
(t
- (uffi:convert-from-foreign-string char-ptr :locale :none)))))))
-
+ (if length
+ (uffi:convert-from-foreign-string char-ptr :locale :none
+ :null-terminated-p nil
+ :length length)
+ (uffi:convert-from-foreign-string char-ptr :locale :none))))))))
+