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

General cleanup and refactor.

Browse Source
This commit is contained in:
Natalia Portillo
2022-03-07 07:36:44 +00:00
parent bc6e432565
commit 762e3eb6d2
1321 changed files with 44657 additions and 45479 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Aaru.Images/VDI/Read.cs
View File

@@ -30,6 +30,8 @@
// Copyright © 2011-2022 Natalia Portillo
// ****************************************************************************/
namespace Aaru.DiscImages;
using System;
using System.Collections.Generic;
using System.IO;
@@ -40,8 +42,6 @@ using Aaru.CommonTypes.Interfaces;
using Aaru.Console;
using Marshal = Aaru.Helpers.Marshal;
namespace Aaru.DiscImages;
public sealed partial class Vdi
{
/// <inheritdoc />
@@ -53,7 +53,7 @@ public sealed partial class Vdi
if(stream.Length < 512)
return ErrorNumber.InvalidArgument;
byte[] vHdrB = new byte[Marshal.SizeOf<Header>()];
var vHdrB = new byte[Marshal.SizeOf<Header>()];
stream.Read(vHdrB, 0, Marshal.SizeOf<Header>());
_vHdr = Marshal.ByteArrayToStructureLittleEndian<Header>(vHdrB);
@@ -97,7 +97,7 @@ public sealed partial class Vdi
DateTime start = DateTime.UtcNow;
AaruConsole.DebugWriteLine("VirtualBox plugin", "Reading Image Block Map");
stream.Seek(_vHdr.offsetBlocks, SeekOrigin.Begin);
byte[] ibmB = new byte[_vHdr.blocks * 4];
var ibmB = new byte[_vHdr.blocks * 4];
stream.Read(ibmB, 0, ibmB.Length);
_ibm = MemoryMarshal.Cast<byte, uint>(ibmB).ToArray();
DateTime end = DateTime.UtcNow;
@@ -218,9 +218,9 @@ public sealed partial class Vdi
return ErrorNumber.NoError;
}
ulong imageOff = _vHdr.offsetData + ((ulong)ibmOff * _vHdr.blockSize);
ulong imageOff = _vHdr.offsetData + (ulong)ibmOff * _vHdr.blockSize;
byte[] cluster = new byte[_vHdr.blockSize];
var cluster = new byte[_vHdr.blockSize];
_imageStream.Seek((long)imageOff, SeekOrigin.Begin);
_imageStream.Read(cluster, 0, (int)_vHdr.blockSize);
buffer = new byte[_vHdr.sectorSize];