diff options
| author | Rob Mensching <rob@firegiant.com> | 2020-02-05 14:36:35 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2020-02-05 14:43:36 -0800 |
| commit | df8f367c7bc515be7f5652338f1e64e6a9e6acd8 (patch) | |
| tree | 3092126d5304e8881b58556fb77fbf1b9b9e237d /src/WixToolset.Data/WindowsInstaller/SubStorage.cs | |
| parent | e87c38acec6597ab4d98820e2ba1fc891483c023 (diff) | |
| download | wix-df8f367c7bc515be7f5652338f1e64e6a9e6acd8.tar.gz wix-df8f367c7bc515be7f5652338f1e64e6a9e6acd8.tar.bz2 wix-df8f367c7bc515be7f5652338f1e64e6a9e6acd8.zip | |
Code cleanup
Diffstat (limited to 'src/WixToolset.Data/WindowsInstaller/SubStorage.cs')
| -rw-r--r-- | src/WixToolset.Data/WindowsInstaller/SubStorage.cs | 8 |
1 files changed, 5 insertions, 3 deletions
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 | |||
| 39 | /// <returns>New SubStorage object.</returns> | 39 | /// <returns>New SubStorage object.</returns> |
| 40 | internal static SubStorage Read(XmlReader reader) | 40 | internal static SubStorage Read(XmlReader reader) |
| 41 | { | 41 | { |
| 42 | if (!reader.LocalName.Equals("subStorage" == reader.LocalName)) | 42 | if (reader.LocalName != "subStorage") |
| 43 | { | 43 | { |
| 44 | throw new XmlException(); | 44 | throw new XmlException(); |
| 45 | } | 45 | } |
| 46 | 46 | ||
| 47 | WindowsInstallerData data = null; | 47 | WindowsInstallerData data = null; |
| 48 | bool empty = reader.IsEmptyElement; | ||
| 49 | string name = null; | 48 | string name = null; |
| 50 | 49 | ||
| 50 | var empty = reader.IsEmptyElement; | ||
| 51 | |||
| 51 | while (reader.MoveToNextAttribute()) | 52 | while (reader.MoveToNextAttribute()) |
| 52 | { | 53 | { |
| 53 | switch (reader.LocalName) | 54 | switch (reader.LocalName) |
| @@ -60,7 +61,7 @@ namespace WixToolset.Data.WindowsInstaller | |||
| 60 | 61 | ||
| 61 | if (!empty) | 62 | if (!empty) |
| 62 | { | 63 | { |
| 63 | bool done = false; | 64 | var done = false; |
| 64 | 65 | ||
| 65 | while (!done && reader.Read()) | 66 | while (!done && reader.Read()) |
| 66 | { | 67 | { |
| @@ -76,6 +77,7 @@ namespace WixToolset.Data.WindowsInstaller | |||
| 76 | throw new XmlException(); | 77 | throw new XmlException(); |
| 77 | } | 78 | } |
| 78 | break; | 79 | break; |
| 80 | |||
| 79 | case XmlNodeType.EndElement: | 81 | case XmlNodeType.EndElement: |
| 80 | done = true; | 82 | done = true; |
| 81 | break; | 83 | break; |
