r5062: return from san diego

[clsql.git] / uffi / clsql-uffi.lisp

diff --git a/uffi/clsql-uffi.lisp b/uffi/clsql-uffi.lisp
index f50682fa799b308300a9e4bb02c81cea8d9618a6..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
 ;;;;
-;;;; $Id: clsql-uffi.lisp,v 1.2 2002/12/13 12:21:54 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
 ;;;;
@@ -16,8 +16,7 @@
 ;;;; (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)
@@ -83,13 +82,15 @@
 (defmacro split-64-bit-integer (int64)
   `(values (ash ,int64 -32) (logand ,int64 +2^32-1+)))
 
+(uffi:def-type char-ptr-def (* :unsigned-char))
+
 (defun char-ptr-points-to-null (char-ptr)
   "Returns T if foreign character pointer refers to 'NULL' string. Only called for numeric entries"
   ;; Uses short cut and returns T if first character is #\N. It should
   ;; never be non-numeric
-  (let ((char (uffi:ensure-char-character
-              (uffi:deref-pointer char-ptr :char))))
-    (eql char #\N)))
+  (declare (type char-ptr-def char-ptr))
+  (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)
@@ -114,5 +115,5 @@
                  low32
                  (make-64-bit-integer high32 low32)))))
         (t
-         (uffi:convert-from-foreign-string char-ptr)))))))
+         (uffi:convert-from-foreign-string char-ptr :locale :none)))))))