mirror of
https://github.com/aaru-dps/Aaru.git
synced 2025-12-16 19:24:25 +00:00
Refactor: Moved CompareBytes to Helpers.
This commit is contained in:
@@ -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>
|
2017-05-19 Natalia Portillo <claunia@claunia.com>
|
||||||
|
|
||||||
* Swapping.cs:
|
* Swapping.cs:
|
||||||
|
|||||||
66
DiscImageChef.Helpers/CompareBytes.cs
Normal file
66
DiscImageChef.Helpers/CompareBytes.cs
Normal 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;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -44,6 +44,7 @@
|
|||||||
<Compile Include="Swapping.cs" />
|
<Compile Include="Swapping.cs" />
|
||||||
<Compile Include="ArrayIsEmpty.cs" />
|
<Compile Include="ArrayIsEmpty.cs" />
|
||||||
<Compile Include="BigEndianMarshal.cs" />
|
<Compile Include="BigEndianMarshal.cs" />
|
||||||
|
<Compile Include="CompareBytes.cs" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -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>
|
2017-05-27 Natalia Portillo <claunia@claunia.com>
|
||||||
|
|
||||||
* Commands/Checksum.cs:
|
* Commands/Checksum.cs:
|
||||||
|
|||||||
@@ -427,7 +427,7 @@ namespace DiscImageChef.Commands
|
|||||||
byte[] image1Sector = input1Format.ReadSector(sector);
|
byte[] image1Sector = input1Format.ReadSector(sector);
|
||||||
byte[] image2Sector = input2Format.ReadSector(sector);
|
byte[] image2Sector = input2Format.ReadSector(sector);
|
||||||
bool different, sameSize;
|
bool different, sameSize;
|
||||||
CompareBytes(out different, out sameSize, image1Sector, image2Sector);
|
ArrayHelpers.CompareBytes(out different, out sameSize, image1Sector, image2Sector);
|
||||||
if(different)
|
if(different)
|
||||||
{
|
{
|
||||||
imagesDiffer = true;
|
imagesDiffer = true;
|
||||||
@@ -455,35 +455,6 @@ namespace DiscImageChef.Commands
|
|||||||
|
|
||||||
Core.Statistics.AddCommand("compare");
|
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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user