From df8f367c7bc515be7f5652338f1e64e6a9e6acd8 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Wed, 5 Feb 2020 14:36:35 -0800 Subject: Code cleanup --- src/WixToolset.Data/WindowsInstaller/SubStorage.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/WixToolset.Data/WindowsInstaller/SubStorage.cs') diff --git a/src/WixToolset.Data/WindowsInstaller/SubStorage.cs b/src/WixToolset.Data/WindowsInstaller/SubStorage.cs index 6aae1dd8..e24839c0 100644 --- a/src/WixToolset.Data/WindowsInstaller/SubStorage.cs +++ b/src/WixToolset.Data/WindowsInstaller/SubStorage.cs @@ -39,15 +39,16 @@ namespace WixToolset.Data.WindowsInstaller /// New SubStorage object. internal static SubStorage Read(XmlReader reader) { - if (!reader.LocalName.Equals("subStorage" == reader.LocalName)) + if (reader.LocalName != "subStorage") { throw new XmlException(); } WindowsInstallerData data = null; - bool empty = reader.IsEmptyElement; string name = null; + var empty = reader.IsEmptyElement; + while (reader.MoveToNextAttribute()) { switch (reader.LocalName) @@ -60,7 +61,7 @@ namespace WixToolset.Data.WindowsInstaller if (!empty) { - bool done = false; + var done = false; while (!done && reader.Read()) { @@ -76,6 +77,7 @@ namespace WixToolset.Data.WindowsInstaller throw new XmlException(); } break; + case XmlNodeType.EndElement: done = true; break; -- cgit v1.2.3-55-g6feb