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

Refactor: Moved CompareBytes to Helpers.

Browse Source
This commit is contained in:
Natalia Portillo
2017-05-27 18:20:27 +01:00
parent d1e480aa90
commit 212f1ea1cf
5 changed files with 79 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
DiscImageChef.Helpers/ChangeLog
View File

@@ -1,3 +1,9 @@
2017-05-27 Natalia Portillo <claunia@claunia.com>
* CompareBytes.cs:
* DiscImageChef.Helpers.csproj: Refactor: Moved CompareBytes
to Helpers.
2017-05-19 Natalia Portillo <claunia@claunia.com>
* Swapping.cs:

66
DiscImageChef.Helpers/CompareBytes.cs Normal file
View File

@@ -0,0 +1,66 @@
// /***************************************************************************
// The Disc Image Chef
// ----------------------------------------------------------------------------
//
// Filename : CompareBytes.cs
// Author(s) : Natalia Portillo <claunia@claunia.com>
//
// Component : Component
//
// --[ Description ] ----------------------------------------------------------
//
// Description
//
// --[ License ] --------------------------------------------------------------
//
// This library is free software; you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as
// published by the Free Software Foundation; either version 2.1 of the
// License, or (at your option) any later version.
//
// This library is distributed in the hope that it will be useful, but
// WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, see <http://www.gnu.org/licenses/>.
//
// ----------------------------------------------------------------------------
// Copyright © 2011-2017 Natalia Portillo
// ****************************************************************************/
namespace DiscImageChef
{
public static partial class ArrayHelpers
{
public static void CompareBytes(out bool different, out bool sameSize, byte[] compareArray1, byte[] compareArray2)
{
different = false;
sameSize = true;
long leastBytes;
if(compareArray1.LongLength < compareArray2.LongLength)
{
sameSize = false;
leastBytes = compareArray1.LongLength;
}
else if(compareArray1.LongLength > compareArray2.LongLength)
{
sameSize = false;
leastBytes = compareArray2.LongLength;
}
else
leastBytes = compareArray1.LongLength;
for(long i = 0; i < leastBytes; i++)
{
if(compareArray1[i] != compareArray2[i])
{
different = true;
return;
}
}
}
}
}

1
DiscImageChef.Helpers/DiscImageChef.Helpers.csproj
View File

@@ -44,6 +44,7 @@
<Compile Include="Swapping.cs" />
<Compile Include="ArrayIsEmpty.cs" />
<Compile Include="BigEndianMarshal.cs" />
<Compile Include="CompareBytes.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup>

5
DiscImageChef/ChangeLog
View File

@@ -1,3 +1,8 @@
2017-05-27 Natalia Portillo <claunia@claunia.com>
* Commands/Compare.cs:
Refactor: Moved CompareBytes to Helpers.
2017-05-27 Natalia Portillo <claunia@claunia.com>
* Commands/Checksum.cs:

31
DiscImageChef/Commands/Compare.cs
View File

@@ -427,7 +427,7 @@ namespace DiscImageChef.Commands
byte[] image1Sector = input1Format.ReadSector(sector);
byte[] image2Sector = input2Format.ReadSector(sector);
bool different, sameSize;
CompareBytes(out different, out sameSize, image1Sector, image2Sector);
ArrayHelpers.CompareBytes(out different, out sameSize, image1Sector, image2Sector);
if(different)
{
imagesDiffer = true;
@@ -455,35 +455,6 @@ namespace DiscImageChef.Commands
Core.Statistics.AddCommand("compare");
}
static void CompareBytes(out bool different, out bool sameSize, byte[] compareArray1, byte[] compareArray2)
{
different = false;
sameSize = true;
long leastBytes;
if(compareArray1.LongLength < compareArray2.LongLength)
{
sameSize = false;
leastBytes = compareArray1.LongLength;
}
else if(compareArray1.LongLength > compareArray2.LongLength)
{
sameSize = false;
leastBytes = compareArray2.LongLength;
}
else
leastBytes = compareArray1.LongLength;
for(long i = 0; i < leastBytes; i++)
{
if(compareArray1[i] != compareArray2[i])
{
different = true;
return;
}
}
}
}
}