projects
/
clsql.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5795e5a
)
r9438: avoid making new pointers
author
Kevin M. Rosenberg
<kevin@rosenberg.net>
Sun, 23 May 2004 05:14:55 +0000
(
05:14
+0000)
committer
Kevin M. Rosenberg
<kevin@rosenberg.net>
Sun, 23 May 2004 05:14:55 +0000
(
05:14
+0000)
db-oracle/oracle-sql.lisp
patch
|
blob
|
history
diff --git
a/db-oracle/oracle-sql.lisp
b/db-oracle/oracle-sql.lisp
index f4eb28376ffed8801178ecf4587ddf0e0ee1a184..aedff1bab29dc4cb5889f0f75cdb634f0f3e4dca 100644
(file)
--- a/
db-oracle/oracle-sql.lisp
+++ b/
db-oracle/oracle-sql.lisp
@@
-36,6
+36,13
@@
likely that we'll have to worry about the CMUCL limit."))
;; constants - from OCI?
;; constants - from OCI?
+(defvar +unsigned-char-null-pointer+
+ (uffi:make-null-pointer :unsigned-char))
+(defvar +unsigned-short-null-pointer+
+ (uffi:make-null-pointer :unsigned-short))
+(defvar +unsigned-int-null-pointer+
+ (uffi:make-null-pointer :unsigned-int))
+
(defconstant +var-not-in-list+ 1007)
(defconstant +no-data-found+ 1403)
(defconstant +null-value-returned+ 1405)
(defconstant +var-not-in-list+ 1007)
(defconstant +no-data-found+ 1403)
(defconstant +null-value-returned+ 1405)
@@
-414,7
+421,7
@@
the length of that format.")
(value
(let* ((arb (foreign-resource-buffer (cd-indicators cd)))
(indicator (uffi:deref-array arb '(:array :short) irow)))
(value
(let* ((arb (foreign-resource-buffer (cd-indicators cd)))
(indicator (uffi:deref-array arb '(:array :short) irow)))
- ;;
b
(declare (type short-array arb))
+ ;;(declare (type short-array arb))
(unless (= indicator -1)
(ecase (cd-oci-data-type cd)
(#.SQLT-STR
(unless (= indicator -1)
(ecase (cd-oci-data-type cd)
(#.SQLT-STR
@@
-454,7
+461,7
@@
the length of that format.")
(oci-attr-get (deref-vp (qc-stmthp qc))
+oci-htype-stmt+
rowcount
(oci-attr-get (deref-vp (qc-stmthp qc))
+oci-htype-stmt+
rowcount
- (uffi:make-null-pointer :unsigned-long)
+ +unsigned-int-null-pointer+
+oci-attr-row-count+
(deref-vp errhp))
(setf (qc-n-from-oci qc)
+oci-attr-row-count+
(deref-vp errhp))
(setf (qc-n-from-oci qc)
@@
-498,7
+505,7
@@
the length of that format.")
(oci-attr-get (deref-vp stmthp)
+oci-htype-stmt+
stmttype
(oci-attr-get (deref-vp stmthp)
+oci-htype-stmt+
stmttype
- (uffi:make-null-pointer :unsigned-int)
+ +unsigned-int-null-pointer+
+oci-attr-stmt-type+
(deref-vp errhp)
:database db)
+oci-attr-stmt-type+
(deref-vp errhp)
:database db)
@@
-623,7
+630,7
@@
the length of that format.")
(oci-attr-get (deref-vp parmdp)
+oci-dtype-param+
dtype-foreign
(oci-attr-get (deref-vp parmdp)
+oci-dtype-param+
dtype-foreign
- (uffi:make-null-pointer :unsigned-int)
+ +unsigned-int-null-pointer+
+oci-attr-data-type+
(deref-vp errhp))
(let ((dtype (uffi:deref-pointer dtype-foreign :unsigned-short)))
+oci-attr-data-type+
(deref-vp errhp))
(let ((dtype (uffi:deref-pointer dtype-foreign :unsigned-short)))
@@
-636,13
+643,13
@@
the length of that format.")
(oci-attr-get (deref-vp parmdp)
+oci-dtype-param+
precision
(oci-attr-get (deref-vp parmdp)
+oci-dtype-param+
precision
- (uffi:make-null-pointer :unsigned-int)
+ +unsigned-int-null-pointer+
+oci-attr-precision+
(deref-vp errhp))
(oci-attr-get (deref-vp parmdp)
+oci-dtype-param+
scale
+oci-attr-precision+
(deref-vp errhp))
(oci-attr-get (deref-vp parmdp)
+oci-dtype-param+
scale
- (uffi:make-null-pointer :unsigned-int)
+ +unsigned-int-null-pointer+
+oci-attr-scale+
(deref-vp errhp))
(let ((*scale (uffi:deref-pointer scale :byte))
+oci-attr-scale+
(deref-vp errhp))
(let ((*scale (uffi:deref-pointer scale :byte))
@@
-665,7
+672,7
@@
the length of that format.")
(oci-attr-get (deref-vp parmdp)
+oci-dtype-param+
colsize
(oci-attr-get (deref-vp parmdp)
+oci-dtype-param+
colsize
- (uffi:make-null-pointer :unsigned-int) ;; (uffi:pointer-address colsizesize)
+ +unsigned-int-null-pointer+
+oci-attr-data-size+
(deref-vp errhp))
(let ((colsize-including-null (1+ (uffi:deref-pointer colsize :unsigned-long))))
+oci-attr-data-size+
(deref-vp errhp))
(let ((colsize-including-null (1+ (uffi:deref-pointer colsize :unsigned-long))))
@@
-707,7
+714,7
@@
the length of that format.")
sizeof
dtype
(foreign-resource-buffer indicators)
sizeof
dtype
(foreign-resource-buffer indicators)
- (uffi:make-null-pointer :unsigned-short)
+ +unsigned-short-null-pointer+
(foreign-resource-buffer retcodes)
+oci-default+))))))))
(foreign-resource-buffer retcodes)
+oci-default+))))))))