Remove unused locals in System.Data.OleDb (dotnet/corefx#42485)

* emove unused locals in System.Data.OleDband keep some logic using discard. Partially fix issue dotnet/corefx#39962

* Update src/System.Data.OleDb/src/OleDbDataReader.cs

update as suggested (OleDbDataReader)

Co-Authored-By: Stephen Toub <stoub@microsoft.com>
* Update src/System.Data.OleDb/src/OleDbTransaction.cs

Done update as suggested

Co-Authored-By: Stephen Toub <stoub@microsoft.com>
* Update src/System.Data.OleDb/src/RowBinding.cs

Done update as suggested (RowDataBinding)

Co-Authored-By: Stephen Toub <stoub@microsoft.com>
* Update src/System.Data.OleDb/src/RowBinding.cs

Done as suggested

Co-Authored-By: Stephen Toub <stoub@microsoft.com>
* Update src/System.Data.OleDb/src/SafeHandles.cs

Done updating as suggested (SafeHandles)

Co-Authored-By: Stephen Toub <stoub@microsoft.com>
Commit migrated from https://github.com/dotnet/corefx/commit/eceea8b4284ca42d8bd0134414b43c835bd80e4c

diff --git a/src/libraries/System.Data.OleDb/src/OleDbConnection.cs b/src/libraries/System.Data.OleDb/src/OleDbConnection.cs
index d337db4..3a9a17c 100644 (file)
--- a/src/libraries/System.Data.OleDb/src/OleDbConnection.cs
+++ b/src/libraries/System.Data.OleDb/src/OleDbConnection.cs
@@ -515,12 +515,6 @@ namespace System.Data.OleDb
                     ADP.TraceExceptionWithoutRethrow(e);
                 }
             }
-#if DEBUG
-            else
-            {
-                OleDbException exception = OleDbException.CreateException(errorInfo, errorCode, null);
-            }
-#endif
         }
 
         public override void Open()

diff --git a/src/libraries/System.Data.OleDb/src/OleDbConnectionInternal.cs b/src/libraries/System.Data.OleDb/src/OleDbConnectionInternal.cs
index 6cabd02..ebd13dc 100644 (file)
--- a/src/libraries/System.Data.OleDb/src/OleDbConnectionInternal.cs
+++ b/src/libraries/System.Data.OleDb/src/OleDbConnectionInternal.cs
@@ -321,7 +321,6 @@ namespace System.Data.OleDb
 
         public override void EnlistTransaction(SysTx.Transaction transaction)
         {
-            OleDbConnection outerConnection = Connection;
             if (null != LocalTransaction)
             {
                 throw ADP.LocalTransactionPresent();
@@ -821,8 +820,6 @@ namespace System.Data.OleDb
 
         internal Dictionary<string, OleDbPropertyInfo> GetPropertyInfo(Guid[] propertySets)
         {
-            bool isopen = HasSession;
-            OleDbConnectionString constr = ConnectionString;
             Dictionary<string, OleDbPropertyInfo> properties = null;
 
             if (null == propertySets)

diff --git a/src/libraries/System.Data.OleDb/src/OleDbDataAdapter.cs b/src/libraries/System.Data.OleDb/src/OleDbDataAdapter.cs
index cdd5c63..e50b7b5 100644 (file)
--- a/src/libraries/System.Data.OleDb/src/OleDbDataAdapter.cs
+++ b/src/libraries/System.Data.OleDb/src/OleDbDataAdapter.cs
@@ -262,10 +262,6 @@ namespace System.Data.OleDb
                                 UnsafeNativeMethods.GetErrorInfo(0, out errorInfo);
 
                                 string message = string.Empty;
-                                if (null != errorInfo)
-                                {
-                                    OleDbHResult hresult = ODB.GetErrorDescription(errorInfo, hr, out message);
-                                }
                                 throw new COMException(message, (int)hr);
                             }
                             break;
@@ -436,10 +432,6 @@ namespace System.Data.OleDb
                 UnsafeNativeMethods.IErrorInfo errorInfo = null;
                 UnsafeNativeMethods.GetErrorInfo(0, out errorInfo);
                 string message = string.Empty;
-                if (null != errorInfo)
-                {
-                    OleDbHResult hresult = ODB.GetErrorDescription(errorInfo, hr, out message);
-                }
                 throw new COMException(message, (int)hr);
             }
         }

diff --git a/src/libraries/System.Data.OleDb/src/OleDbDataReader.cs b/src/libraries/System.Data.OleDb/src/OleDbDataReader.cs
index 1359e81..5ee968c 100644 (file)
--- a/src/libraries/System.Data.OleDb/src/OleDbDataReader.cs
+++ b/src/libraries/System.Data.OleDb/src/OleDbDataReader.cs
@@ -1166,7 +1166,7 @@ namespace System.Data.OleDb
             {
                 throw ADP.ArgumentNull("values");
             }
-            MetaData info = DoValueCheck(0);
+            DoValueCheck(0);
             int count = Math.Min(values.Length, _visibleFieldCount);
             for (int i = 0; (i < _metadata.Length) && (i < count); ++i)
             {
@@ -2163,7 +2163,6 @@ namespace System.Data.OleDb
                     {
                         bool isPKey = (!dataRow.IsNull(pkeyColumn, DataRowVersion.Default) && (bool)dataRow[pkeyColumn, DataRowVersion.Default]);
                         bool isUniq = (!dataRow.IsNull(uniqCOlumn, DataRowVersion.Default) && (bool)dataRow[uniqCOlumn, DataRowVersion.Default]);
-                        bool nullsVal = (null != nulls) && (dataRow.IsNull(nulls, DataRowVersion.Default) || (ODB.DBPROPVAL_IN_ALLOWNULL == Convert.ToInt32(dataRow[nulls, DataRowVersion.Default], CultureInfo.InvariantCulture)));
 
                         if (isPKey || isUniq)
                         {

diff --git a/src/libraries/System.Data.OleDb/src/OleDbTransaction.cs b/src/libraries/System.Data.OleDb/src/OleDbTransaction.cs
index 2c05339..0db6714 100644 (file)
--- a/src/libraries/System.Data.OleDb/src/OleDbTransaction.cs
+++ b/src/libraries/System.Data.OleDb/src/OleDbTransaction.cs
@@ -108,7 +108,7 @@ namespace System.Data.OleDb
             {
                 if (_mustComplete && (IntPtr.Zero != base.handle))
                 {
-                    OleDbHResult hr = (OleDbHResult)NativeOledbWrapper.ITransactionAbort(base.handle);
+                    NativeOledbWrapper.ITransactionAbort(base.handle);
                     _mustComplete = false;
                 }
                 return base.ReleaseHandle();

diff --git a/src/libraries/System.Data.OleDb/src/RowBinding.cs b/src/libraries/System.Data.OleDb/src/RowBinding.cs
index 6b0f762..9bd1c70 100644 (file)
--- a/src/libraries/System.Data.OleDb/src/RowBinding.cs
+++ b/src/libraries/System.Data.OleDb/src/RowBinding.cs
@@ -478,8 +478,7 @@ namespace System.Data.OleDb
             IntPtr chapter = SafeNativeMethods.InterlockedExchangePointer(ADP.IntPtrOffset(buffer, valueOffset), ADP.PtrZero);
             if (ODB.DB_NULL_HCHAPTER != chapter)
             {
-                int refCount;
-                OleDbHResult hr = chapteredRowset.ReleaseChapter(chapter, out refCount);
+                chapteredRowset.ReleaseChapter(chapter, out _);
             }
         }
 

diff --git a/src/libraries/System.Data.OleDb/src/SafeHandles.cs b/src/libraries/System.Data.OleDb/src/SafeHandles.cs
index cf48722..727d3d4 100644 (file)
--- a/src/libraries/System.Data.OleDb/src/SafeHandles.cs
+++ b/src/libraries/System.Data.OleDb/src/SafeHandles.cs
@@ -160,7 +160,7 @@ namespace System.Data.OleDb
 
             if ((IntPtr.Zero != base.handle) && (IntPtr.Zero != chapter))
             {
-                OleDbHResult hr = (OleDbHResult)NativeOledbWrapper.IChapteredRowsetReleaseChapter(base.handle, chapter);
+                NativeOledbWrapper.IChapteredRowsetReleaseChapter(base.handle, chapter);
             }
             return base.ReleaseHandle();
         }