aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2025-12-16 19:24:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

REFACTOR: Invert 'if' statement to reduce nesting.

Browse Source
This commit is contained in:
Natalia Portillo
2017-12-21 06:06:19 +00:00
parent 0077694c75
commit 4ce965e6cf
9 changed files with 116 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Extents/ExtentsByte.cs
View File

@@ -82,19 +82,18 @@ namespace Extents
} }
// Expands existing extent end // Expands existing extent end
if(item == backend[i].Item2 + 1) if(item != backend[i].Item2 + 1) continue;
removeOne = backend[i];
if(i < backend.Count - 1 && item == backend[i + 1].Item1 - 1)
{ {
removeOne = backend[i]; removeTwo = backend[i + 1];
itemToAdd = new Tuple<byte, byte>(backend[i].Item1, backend[i + 1].Item2);
if(i < backend.Count - 1 && item == backend[i + 1].Item1 - 1)
{
removeTwo = backend[i + 1];
itemToAdd = new Tuple<byte, byte>(backend[i].Item1, backend[i + 1].Item2);
}
else itemToAdd = new Tuple<byte, byte>(backend[i].Item1, item);
break;
} }
else itemToAdd = new Tuple<byte, byte>(backend[i].Item1, item);
break;
} }
if(itemToAdd != null) if(itemToAdd != null)
@@ -170,11 +169,10 @@ namespace Extents
} }
// Extent is only element // Extent is only element
if(item == extent.Item1 && item == extent.Item2) if(item != extent.Item1 || item != extent.Item2) continue;
{
toRemove = extent; toRemove = extent;
break; break;
}
} }
// Item not found // Item not found

30
Extents/ExtentsInt.cs
View File

@@ -82,19 +82,18 @@ namespace Extents
} }
// Expands existing extent end // Expands existing extent end
if(item == backend[i].Item2 + 1) if(item != backend[i].Item2 + 1) continue;
removeOne = backend[i];
if(i < backend.Count - 1 && item == backend[i + 1].Item1 - 1)
{ {
removeOne = backend[i]; removeTwo = backend[i + 1];
itemToAdd = new Tuple<int, int>(backend[i].Item1, backend[i + 1].Item2);
if(i < backend.Count - 1 && item == backend[i + 1].Item1 - 1)
{
removeTwo = backend[i + 1];
itemToAdd = new Tuple<int, int>(backend[i].Item1, backend[i + 1].Item2);
}
else itemToAdd = new Tuple<int, int>(backend[i].Item1, item);
break;
} }
else itemToAdd = new Tuple<int, int>(backend[i].Item1, item);
break;
} }
if(itemToAdd != null) if(itemToAdd != null)
@@ -170,11 +169,10 @@ namespace Extents
} }
// Extent is only element // Extent is only element
if(item == extent.Item1 && item == extent.Item2) if(item != extent.Item1 || item != extent.Item2) continue;
{
toRemove = extent; toRemove = extent;
break; break;
}
} }
// Item not found // Item not found

30
Extents/ExtentsLong.cs
View File

@@ -82,19 +82,18 @@ namespace Extents
} }
// Expands existing extent end // Expands existing extent end
if(item == backend[i].Item2 + 1) if(item != backend[i].Item2 + 1) continue;
removeOne = backend[i];
if(i < backend.Count - 1 && item == backend[i + 1].Item1 - 1)
{ {
removeOne = backend[i]; removeTwo = backend[i + 1];
itemToAdd = new Tuple<long, long>(backend[i].Item1, backend[i + 1].Item2);
if(i < backend.Count - 1 && item == backend[i + 1].Item1 - 1)
{
removeTwo = backend[i + 1];
itemToAdd = new Tuple<long, long>(backend[i].Item1, backend[i + 1].Item2);
}
else itemToAdd = new Tuple<long, long>(backend[i].Item1, item);
break;
} }
else itemToAdd = new Tuple<long, long>(backend[i].Item1, item);
break;
} }
if(itemToAdd != null) if(itemToAdd != null)
@@ -170,11 +169,10 @@ namespace Extents
} }
// Extent is only element // Extent is only element
if(item == extent.Item1 && item == extent.Item2) if(item != extent.Item1 || item != extent.Item2) continue;
{
toRemove = extent; toRemove = extent;
break; break;
}
} }
// Item not found // Item not found

30
Extents/ExtentsSByte.cs
View File

@@ -82,19 +82,18 @@ namespace Extents
} }
// Expands existing extent end // Expands existing extent end
if(item == backend[i].Item2 + 1) if(item != backend[i].Item2 + 1) continue;
removeOne = backend[i];
if(i < backend.Count - 1 && item == backend[i + 1].Item1 - 1)
{ {
removeOne = backend[i]; removeTwo = backend[i + 1];
itemToAdd = new Tuple<sbyte, sbyte>(backend[i].Item1, backend[i + 1].Item2);
if(i < backend.Count - 1 && item == backend[i + 1].Item1 - 1)
{
removeTwo = backend[i + 1];
itemToAdd = new Tuple<sbyte, sbyte>(backend[i].Item1, backend[i + 1].Item2);
}
else itemToAdd = new Tuple<sbyte, sbyte>(backend[i].Item1, item);
break;
} }
else itemToAdd = new Tuple<sbyte, sbyte>(backend[i].Item1, item);
break;
} }
if(itemToAdd != null) if(itemToAdd != null)
@@ -170,11 +169,10 @@ namespace Extents
} }
// Extent is only element // Extent is only element
if(item == extent.Item1 && item == extent.Item2) if(item != extent.Item1 || item != extent.Item2) continue;
{
toRemove = extent; toRemove = extent;
break; break;
}
} }
// Item not found // Item not found

30
Extents/ExtentsShort.cs
View File

@@ -82,19 +82,18 @@ namespace Extents
} }
// Expands existing extent end // Expands existing extent end
if(item == backend[i].Item2 + 1) if(item != backend[i].Item2 + 1) continue;
removeOne = backend[i];
if(i < backend.Count - 1 && item == backend[i + 1].Item1 - 1)
{ {
removeOne = backend[i]; removeTwo = backend[i + 1];
itemToAdd = new Tuple<short, short>(backend[i].Item1, backend[i + 1].Item2);
if(i < backend.Count - 1 && item == backend[i + 1].Item1 - 1)
{
removeTwo = backend[i + 1];
itemToAdd = new Tuple<short, short>(backend[i].Item1, backend[i + 1].Item2);
}
else itemToAdd = new Tuple<short, short>(backend[i].Item1, item);
break;
} }
else itemToAdd = new Tuple<short, short>(backend[i].Item1, item);
break;
} }
if(itemToAdd != null) if(itemToAdd != null)
@@ -170,11 +169,10 @@ namespace Extents
} }
// Extent is only element // Extent is only element
if(item == extent.Item1 && item == extent.Item2) if(item != extent.Item1 || item != extent.Item2) continue;
{
toRemove = extent; toRemove = extent;
break; break;
}
} }
// Item not found // Item not found

30
Extents/ExtentsUInt.cs
View File

@@ -82,19 +82,18 @@ namespace Extents
} }
// Expands existing extent end // Expands existing extent end
if(item == backend[i].Item2 + 1) if(item != backend[i].Item2 + 1) continue;
removeOne = backend[i];
if(i < backend.Count - 1 && item == backend[i + 1].Item1 - 1)
{ {
removeOne = backend[i]; removeTwo = backend[i + 1];
itemToAdd = new Tuple<uint, uint>(backend[i].Item1, backend[i + 1].Item2);
if(i < backend.Count - 1 && item == backend[i + 1].Item1 - 1)
{
removeTwo = backend[i + 1];
itemToAdd = new Tuple<uint, uint>(backend[i].Item1, backend[i + 1].Item2);
}
else itemToAdd = new Tuple<uint, uint>(backend[i].Item1, item);
break;
} }
else itemToAdd = new Tuple<uint, uint>(backend[i].Item1, item);
break;
} }
if(itemToAdd != null) if(itemToAdd != null)
@@ -170,11 +169,10 @@ namespace Extents
} }
// Extent is only element // Extent is only element
if(item == extent.Item1 && item == extent.Item2) if(item != extent.Item1 || item != extent.Item2) continue;
{
toRemove = extent; toRemove = extent;
break; break;
}
} }
// Item not found // Item not found

30
Extents/ExtentsULong.cs
View File

@@ -82,19 +82,18 @@ namespace Extents
} }
// Expands existing extent end // Expands existing extent end
if(item == backend[i].Item2 + 1) if(item != backend[i].Item2 + 1) continue;
removeOne = backend[i];
if(i < backend.Count - 1 && item == backend[i + 1].Item1 - 1)
{ {
removeOne = backend[i]; removeTwo = backend[i + 1];
itemToAdd = new Tuple<ulong, ulong>(backend[i].Item1, backend[i + 1].Item2);
if(i < backend.Count - 1 && item == backend[i + 1].Item1 - 1)
{
removeTwo = backend[i + 1];
itemToAdd = new Tuple<ulong, ulong>(backend[i].Item1, backend[i + 1].Item2);
}
else itemToAdd = new Tuple<ulong, ulong>(backend[i].Item1, item);
break;
} }
else itemToAdd = new Tuple<ulong, ulong>(backend[i].Item1, item);
break;
} }
if(itemToAdd != null) if(itemToAdd != null)
@@ -170,11 +169,10 @@ namespace Extents
} }
// Extent is only element // Extent is only element
if(item == extent.Item1 && item == extent.Item2) if(item != extent.Item1 || item != extent.Item2) continue;
{
toRemove = extent; toRemove = extent;
break; break;
}
} }
// Item not found // Item not found

30
Extents/ExtentsUShort.cs
View File

@@ -82,19 +82,18 @@ namespace Extents
} }
// Expands existing extent end // Expands existing extent end
if(item == backend[i].Item2 + 1) if(item != backend[i].Item2 + 1) continue;
removeOne = backend[i];
if(i < backend.Count - 1 && item == backend[i + 1].Item1 - 1)
{ {
removeOne = backend[i]; removeTwo = backend[i + 1];
itemToAdd = new Tuple<ushort, ushort>(backend[i].Item1, backend[i + 1].Item2);
if(i < backend.Count - 1 && item == backend[i + 1].Item1 - 1)
{
removeTwo = backend[i + 1];
itemToAdd = new Tuple<ushort, ushort>(backend[i].Item1, backend[i + 1].Item2);
}
else itemToAdd = new Tuple<ushort, ushort>(backend[i].Item1, item);
break;
} }
else itemToAdd = new Tuple<ushort, ushort>(backend[i].Item1, item);
break;
} }
if(itemToAdd != null) if(itemToAdd != null)
@@ -171,11 +170,10 @@ namespace Extents
} }
// Extent is only element // Extent is only element
if(item == extent.Item1 && item == extent.Item2) if(item != extent.Item1 || item != extent.Item2) continue;
{
toRemove = extent; toRemove = extent;
break; break;
}
} }
// Item not found // Item not found

9
StringHandlers.cs
View File

@@ -145,11 +145,10 @@ namespace DiscImageChef
{ {
if(i == start) return ""; if(i == start) return "";
if(SpacePaddedString[i - 1] != 0x20) if(SpacePaddedString[i - 1] == 0x20) continue;
{
len = i; len = i;
break; break;
}
} }
return len == 0 ? "" : encoding.GetString(SpacePaddedString, start, len); return len == 0 ? "" : encoding.GetString(SpacePaddedString, start, len);