X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=db-oracle%2Foracle-api.lisp;h=1ac8ea81245161e45de37f54dd66eeac7f12ad5c;hb=ddae27a4c55b8a055afc167bd7d65c766cc6c78e;hp=dbbc5dccf4bd49890850b98c0a85f068c0a0b7c8;hpb=87e483c1247899a7ad5fff2daf2ca0df0526a9e0;p=clsql.git diff --git a/db-oracle/oracle-api.lisp b/db-oracle/oracle-api.lisp index dbbc5dc..1ac8ea8 100644 --- a/db-oracle/oracle-api.lisp +++ b/db-oracle/oracle-api.lisp @@ -30,7 +30,7 @@ (defvar +null-void-pointer+ (uffi:make-null-pointer :void)) -(defvar +null-void-pointer-pointer+ (uffi:make-null-pointer ':pointer-void)) +(defvar +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. @@ -126,7 +126,7 @@ :int (srvhp :pointer-void) ; oci-server (errhp :pointer-void) ; oci-error - (dblink :cstring) ; :in + (dblink :cstring) ; :in (dblink-len :unsigned-long) ; int (mode :unsigned-long)) ; int @@ -261,11 +261,9 @@ (hndltype :short)) -#+nil -(progn -;;; Low-level functions which don't use return checking -;;; -;;; KMR: These are currently unused by the backend + +;;; Low-level routines that don't do error checking. They are used +;;; for setting up global environment. (uffi:def-function "OCIInitialize" ((mode :unsigned-long) ; ub4 @@ -282,9 +280,6 @@ (usermempp (* :pointer-void))) :returning :int) -(def-oci-routine ("OCIHandleAlloc" oci-handle-alloc) - :int -) (uffi:def-function "OCIHandleAlloc" ((parenth :pointer-void) ; const dvoid * @@ -365,4 +360,3 @@ (let ((envhp (oci-get-handle :type :env))) (oci-env-init envhp 0 0 +null-void-pointer+) envhp)) -)