From 69e146090f7c78c4d51023c25a0c1a1eade224a1 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Wed, 10 May 2006 00:45:15 +0000 Subject: [PATCH] r10936: 08 May 2006 Kevin Rosenberg * Version: 3.6.0 (requires UFFI v1.5.11 or greater) * db-oracle/metaclasses.lisp: Patch from James Bielman for checking slot constraints. * db-oracle/oracle-{api,sql}.lisp: Avoid dead pointers on loading saved openmcl images (based on patch from James Bielman) --- ChangeLog | 5 ++++- db-oracle/oracle-api.lisp | 19 ++++++++++--------- db-oracle/oracle-sql.lisp | 6 +++--- debian/changelog | 6 ++++++ debian/control | 2 +- 5 files changed, 24 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7496e5d..d5b4811 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,9 @@ 08 May 2006 Kevin Rosenberg - * sql/metaclasses.lisp: Patch from James Bielman for + * Version: 3.6.0 (requires UFFI v1.5.11 or greater) + * db-oracle/metaclasses.lisp: Patch from James Bielman for checking slot constraints. + * db-oracle/oracle-{api,sql}.lisp: Avoid dead pointers on loading + saved openmcl images (based on patch from James Bielman) 06 May 2006 Kevin Rosenberg * doc/ref-fdml.xml: Documentation patch from Marcus Pearce for limit keyword diff --git a/db-oracle/oracle-api.lisp b/db-oracle/oracle-api.lisp index 377c3f3..3b0a7ee 100644 --- a/db-oracle/oracle-api.lisp +++ b/db-oracle/oracle-api.lisp @@ -37,9 +37,10 @@ (uffi:def-foreign-type oci-svc-ctx :pointer-void) (uffi:def-foreign-type oci-stmt :pointer-void) - -(defvar +null-void-pointer+ (uffi:make-null-pointer :void)) -(defvar +null-void-pointer-pointer+ (uffi:make-null-pointer :pointer-void)) +(uffi:def-pointer-var +null-void-pointer+ + (uffi:make-null-pointer :void)) +(uffi:def-pointer-var +null-void-pointer-pointer+ + (uffi:make-null-pointer :pointer-void)) ;;; Check an OCI return code for erroricity and signal a reasonably ;;; informative condition if so. @@ -65,7 +66,7 @@ (if (= result #.+oci-success+) +oci-success+ (handle-oci-result result database nulls-ok))))))) - + (defmacro def-raw-oci-routine ((c-oci-symbol lisp-oci-fn) c-return &rest c-parms) @@ -92,7 +93,7 @@ (mode ub4) ; ub4 (xtramem-sz size_t) ; size_t (usermempp (* :pointer-void))) ; dvoid ** - + #-oci7 (def-oci-routine ("OCIEnvCreate" oci-env-create) :int @@ -209,10 +210,10 @@ (position ub4) (valuep :pointer-void) (value_sz sb4) - (dty ub2) + (dty ub2) (indp (* sb2)) - (rlenp (* ub2)) - (rcodep (* ub2)) + (rlenp (* ub2)) + (rcodep (* ub2)) (mode ub4)) (def-oci-routine ("OCIStmtFetch" oci-stmt-fetch) @@ -273,7 +274,7 @@ :returning :int) -(uffi:def-function "OCIHandleAlloc" +(uffi:def-function "OCIHandleAlloc" ((parenth :pointer-void) ; const dvoid * (hndlpp (* :pointer-void)) ; dvoid ** (type ub4) ; ub4 diff --git a/db-oracle/oracle-sql.lisp b/db-oracle/oracle-sql.lisp index aa7c6d7..fc3188f 100644 --- a/db-oracle/oracle-sql.lisp +++ b/db-oracle/oracle-sql.lisp @@ -37,11 +37,11 @@ likely that we'll have to worry about the CMUCL limit.")) (defmacro deref-vp (foreign-object) `(the vp-type (uffi:deref-pointer (the vpp-type ,foreign-object) :pointer-void))) -(defvar +unsigned-char-null-pointer+ +(uffi:def-pointer-var +unsigned-char-null-pointer+ (uffi:make-null-pointer :unsigned-char)) -(defvar +unsigned-short-null-pointer+ +(uffi:def-pointer-var +unsigned-short-null-pointer+ (uffi:make-null-pointer :unsigned-short)) -(defvar +unsigned-int-null-pointer+ +(uffi:def-pointer-var +unsigned-int-null-pointer+ (uffi:make-null-pointer :unsigned-int)) ;; constants - from OCI? diff --git a/debian/changelog b/debian/changelog index ce66a8c..b034fc8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cl-sql (3.6.0-1) unstable; urgency=low + + * New upstream + + -- Kevin M. Rosenberg Tue, 9 May 2006 09:41:58 -0600 + cl-sql (3.5.7-1) unstable; urgency=low * New upstream diff --git a/debian/control b/debian/control index a178dcf..ca3d7c2 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,7 @@ Description: SQL Interface for Common Lisp Package: cl-sql-uffi Architecture: any -Depends: cl-uffi, cl-sql (>= ${Source-Version}), ${shlibs:Depends} +Depends: cl-uffi (>= 1.5.11), cl-sql (>= ${Source-Version}), ${shlibs:Depends} Recommends: cl-sql-backend Description: Common UFFI functions for CLSQL database backends This package provides an interface to several UFFI functions used by multiple -- 2.34.1