projects
/
clsql.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r5062: return from san diego
[clsql.git]
/
uffi
/
clsql-uffi.lisp
diff --git
a/uffi/clsql-uffi.lisp
b/uffi/clsql-uffi.lisp
index 3b5cf719382429f26428870de84d5bb7754a1b61..41d38b0a88ba98c3bbd9b211e22f6e255b76b818 100644
(file)
--- a/
uffi/clsql-uffi.lisp
+++ b/
uffi/clsql-uffi.lisp
@@
-7,7
+7,7
@@
;;;; Programmers: Kevin M. Rosenberg
;;;; Date Started: Mar 2002
;;;;
;;;; Programmers: Kevin M. Rosenberg
;;;; Date Started: Mar 2002
;;;;
-;;;; $Id: clsql-uffi.lisp,v 1.
5 2003/05/06 02:22:58
kevin Exp $
+;;;; $Id: clsql-uffi.lisp,v 1.
29 2003/06/06 21:59:09
kevin Exp $
;;;;
;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
;;;;
;;;;
;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
;;;;
@@
-16,8
+16,7
@@
;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
;;;; *************************************************************************
;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
;;;; *************************************************************************
-(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
-(in-package :clsql-uffi)
+(in-package #:clsql-uffi)
(defun canonicalize-type-list (types auto-list)
(defun canonicalize-type-list (types auto-list)
@@
-83,9
+82,6
@@
(defmacro split-64-bit-integer (int64)
`(values (ash ,int64 -32) (logand ,int64 +2^32-1+)))
(defmacro split-64-bit-integer (int64)
`(values (ash ,int64 -32) (logand ,int64 +2^32-1+)))
-(defvar +ascii-N-value+ (char-code #\N))
-(defvar +ascii-U-value+ (char-code #\U))
-
(uffi:def-type char-ptr-def (* :unsigned-char))
(defun char-ptr-points-to-null (char-ptr)
(uffi:def-type char-ptr-def (* :unsigned-char))
(defun char-ptr-points-to-null (char-ptr)
@@
-93,9
+89,8
@@
;; Uses short cut and returns T if first character is #\N. It should
;; never be non-numeric
(declare (type char-ptr-def char-ptr))
;; Uses short cut and returns T if first character is #\N. It should
;; never be non-numeric
(declare (type char-ptr-def char-ptr))
- (let ((char (uffi:ensure-char-character
- (uffi:deref-pointer char-ptr :char))))
- (eql char #\N)))
+ (char-equal #\N (uffi:ensure-char-character
+ (uffi:deref-pointer char-ptr :char))))
(defun convert-raw-field (char-ptr types index)
(let ((type (if (listp types)
(defun convert-raw-field (char-ptr types index)
(let ((type (if (listp types)
@@
-120,5
+115,5
@@
low32
(make-64-bit-integer high32 low32)))))
(t
low32
(make-64-bit-integer high32 low32)))))
(t
- (uffi:convert-from-foreign-string char-ptr)))))))
+ (uffi:convert-from-foreign-string char-ptr
:locale :none
)))))))