Merge pull request dotnet#35319 from krwq/nullable-xml-1

Nullable: System.Xml, part 1
godspeedu · Apr 27, 2020 · 919925a · 919925a
2 parents 5bde93a + 916c23a
commit 919925a
Show file tree

Hide file tree

Showing 41 changed files with 937 additions and 500 deletions.
diff --git a/src/libraries/System.Private.Xml/src/Misc/HResults.cs b/src/libraries/System.Private.Xml/src/Misc/HResults.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#nullable enable
 /*
 These HRESULTs are used for mapping managed exceptions to COM error codes
 and vice versa through COM Interop.  For background on COM error codes see

diff --git a/src/libraries/System.Private.Xml/src/System/Xml/BinaryXml/BinXmlToken.cs b/src/libraries/System.Private.Xml/src/System/Xml/BinaryXml/BinXmlToken.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#nullable enable
 using System;
 using System.Collections;
 using System.IO;
@@ -81,4 +82,4 @@ internal enum BinXmlToken
         XSD_UNSIGNEDLONG = 0x8B,
         XSD_QNAME = 0x8C,
     }
-}
+}
diff --git a/src/libraries/System.Private.Xml/src/System/Xml/BinaryXml/SqlUtils.cs b/src/libraries/System.Private.Xml/src/System/Xml/BinaryXml/SqlUtils.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#nullable enable
 using System;
 using System.Collections;
 using System.IO;
@@ -46,7 +47,7 @@ public BinXmlSqlDecimal(byte[] data, int offset, bool trim)
                 11 => 2,
                 15 => 3,
                 19 => 4,
-                _ => throw new XmlException(SR.XmlBinary_InvalidSqlDecimal, (string[])null),
+                _ => throw new XmlException(SR.XmlBinary_InvalidSqlDecimal, (string[]?)null),
             };
             m_bPrec = data[offset + 1];
             m_bScale = data[offset + 2];
@@ -109,6 +110,7 @@ out uint iulR        // Out    | R
             iulR = ulCarry;
             MpNormalize(rgulU, ref ciulU);
         }
+
         // Normalize multi-precision number - remove leading zeroes
         private static void MpNormalize(uint[] rgulU,      // In   | Number
                                         ref int ciulU       // InOut| # of digits
@@ -131,6 +133,7 @@ ref int ciulU       // InOut| # of digits
         private static ReadOnlySpan<byte> RgCLenFromPrec => new byte[] { // rely on C# compiler optimization to eliminate allocation
             1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4
         };
+
         private static byte CLenFromPrec(byte bPrec)
         {
             Debug.Assert(bPrec <= s_maxPrecision && bPrec > 0, "bPrec <= MaxPrecision && bPrec > 0", "Invalid numeric precision");
@@ -146,7 +149,7 @@ private static char ChFromDigit(uint uiDigit)
         public decimal ToDecimal()
         {
             if ((int)m_data4 != 0 || m_bScale > 28)
-                throw new XmlException(SR.SqlTypes_ArithOverflow, (string)null);
+                throw new XmlException(SR.SqlTypes_ArithOverflow, (string?)null);
 
             return new decimal((int)m_data1, (int)m_data2, (int)m_data3, !IsPositive, m_bScale);
         }
@@ -452,7 +455,7 @@ private static void BreakDownXsdDateTime(long val, out int yr, out int mnth, out
                 goto Error;
             return;
 Error:
-            throw new XmlException(SR.SqlTypes_ArithOverflow, (string)null);
+            throw new XmlException(SR.SqlTypes_ArithOverflow, (string?)null);
         }
 
         private static void BreakDownXsdDate(long val, out int yr, out int mnth, out int day, out bool negTimeZone, out int hr, out int min)
@@ -477,7 +480,7 @@ private static void BreakDownXsdDate(long val, out int yr, out int mnth, out int
                 goto Error;
             return;
 Error:
-            throw new XmlException(SR.SqlTypes_ArithOverflow, (string)null);
+            throw new XmlException(SR.SqlTypes_ArithOverflow, (string?)null);
         }
 
         private static void BreakDownXsdTime(long val, out int hr, out int min, out int sec, out int ms)
@@ -495,7 +498,7 @@ private static void BreakDownXsdTime(long val, out int hr, out int min, out int
                 goto Error;
             return;
 Error:
-            throw new XmlException(SR.SqlTypes_ArithOverflow, (string)null);
+            throw new XmlException(SR.SqlTypes_ArithOverflow, (string?)null);
         }
 
         public static string XsdDateTimeToString(long val)
@@ -765,7 +768,7 @@ private static long GetKatmaiTimeTicks(byte[] data, ref int pos)
             }
             else
             {
-                throw new XmlException(SR.SqlTypes_ArithOverflow, (string)null);
+                throw new XmlException(SR.SqlTypes_ArithOverflow, (string?)null);
             }
             return timeTicks * KatmaiTimeScaleMultiplicator[scale];
         }