2005-10-24 Sebastien Pouliot <sebastien@ximian.com>

[mono.git] / mcs / class / System.Data.OracleClient / System.Data.OracleClient.Oci / OciEnvironmentHandle.cs

diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.Oci/OciEnvironmentHandle.cs b/mcs/class/System.Data.OracleClient/System.Data.OracleClient.Oci/OciEnvironmentHandle.cs
index ec642ac2d737a496cb48883c10f305f361825ac7..663fe51f6e15d3d0cdf7b6058c87ad975c8574fe 100644 (file)
--- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.Oci/OciEnvironmentHandle.cs
+++ b/mcs/class/System.Data.OracleClient/System.Data.OracleClient.Oci/OciEnvironmentHandle.cs
@@ -31,9 +31,8 @@ namespace System.Data.OracleClient.Oci {
                public OciEnvironmentHandle (OciEnvironmentMode mode)
                        : base (OciHandleType.Environment, null, IntPtr.Zero)
                {
-                       int status = 0;
-                       IntPtr handle = IntPtr.Zero;
-                       status = OCIEnvCreate (out handle, 
+                       IntPtr newHandle = IntPtr.Zero;
+                       OciCalls.OCIEnvCreate (out newHandle, 
                                                mode, 
                                                IntPtr.Zero, 
                                                IntPtr.Zero, 
@@ -42,23 +41,13 @@ namespace System.Data.OracleClient.Oci {
                                                0, 
                                                IntPtr.Zero);
 
-                       SetHandle (handle);
+                       SetHandle (newHandle);
                }
 
                #endregion // Constructors
 
                #region Methods
 
-               [DllImport ("oci")]
-               static extern int OCIEnvCreate (out IntPtr envhpp,
-                                               [MarshalAs (UnmanagedType.U4)] OciEnvironmentMode mode,
-                                               IntPtr ctxp,
-                                               IntPtr malocfp,
-                                               IntPtr ralocfp,
-                                               IntPtr mfreep,
-                                               int xtramem_sz,
-                                               IntPtr usrmempp);
-
                public OciErrorInfo HandleError ()
                {
                        int errbufSize = 512;
@@ -68,7 +57,7 @@ namespace System.Data.OracleClient.Oci {
                        info.ErrorCode = 0;
                        info.ErrorMessage = String.Empty;
 
-                       OciGlue.OCIErrorGet (handle,
+                       OciCalls.OCIErrorGet (Handle,
                                        1,
                                        IntPtr.Zero,
                                        out info.ErrorCode,