* Makefile ($(build_lib)): Make CYCLIC_DEP_FILES depend on this.

[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 551dabfd1cb71463adcbf638209ff8df1de88c32..67367ae8c8699dadaf1c57522f9bae4886f540a5 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 newHandle = IntPtr.Zero;
-                       status = OciCalls.OCIEnvCreate (out newHandle, 
+                       OciCalls.OCIEnvCreate (out newHandle, 
                                                mode, 
                                                IntPtr.Zero, 
                                                IntPtr.Zero, 
@@ -51,28 +50,7 @@ namespace System.Data.OracleClient.Oci {
 
                public OciErrorInfo HandleError ()
                {
-                       int errbufSize = 512;
-                       IntPtr errbuf = Marshal.AllocHGlobal (errbufSize);
-
-                       OciErrorInfo info;
-                       info.ErrorCode = 0;
-                       info.ErrorMessage = String.Empty;
-
-                       OciCalls.OCIErrorGet (Handle,
-                                       1,
-                                       IntPtr.Zero,
-                                       out info.ErrorCode,
-                                       errbuf,
-                                       (uint) errbufSize,
-                                       OciHandleType.Environment);
-
-                       object err = Marshal.PtrToStringAnsi (errbuf);
-                       if (err != null) {
-                               string errmsg = (string) err;
-                               info.ErrorMessage = String.Copy (errmsg);
-                               Marshal.FreeHGlobal (errbuf);
-                       }
-
+                       OciErrorInfo info = OciErrorHandle.HandleError (this);
                        return info;
                }