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

Override Marshal.SizeOf in Helpers and use it instead of System's.

Browse Source
This commit is contained in:
Natalia Portillo
2019-03-01 07:35:22 +00:00
parent 0ec558da55
commit e14c19279a
116 changed files with 1138 additions and 1182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
DiscImageChef.Filesystems/UNICOS.cs
View File

@@ -44,6 +44,7 @@ using daddr_t = System.Int64;
using dev_t = System.Int64;
using extent_t = System.Int64;
using ino_t = System.Int64;
using Marshal = DiscImageChef.Helpers.Marshal;
using time_t = System.Int64;
namespace DiscImageChef.Filesystems
@@ -66,15 +67,13 @@ namespace DiscImageChef.Filesystems
{
if(imagePlugin.Info.SectorSize < 512) return false;
UNICOS_Superblock unicosSb = new UNICOS_Superblock();
uint sbSize = (uint)(Marshal.SizeOf(unicosSb) / imagePlugin.Info.SectorSize);
if(Marshal.SizeOf(unicosSb) % imagePlugin.Info.SectorSize != 0) sbSize++;
uint sbSize = (uint)(Marshal.SizeOf<UNICOS_Superblock>() / imagePlugin.Info.SectorSize);
if(Marshal.SizeOf<UNICOS_Superblock>() % imagePlugin.Info.SectorSize != 0) sbSize++;
byte[] sector = imagePlugin.ReadSectors(partition.Start, sbSize);
if(sector.Length < Marshal.SizeOf(unicosSb)) return false;
if(sector.Length < Marshal.SizeOf<UNICOS_Superblock>()) return false;
unicosSb = Helpers.Marshal.ByteArrayToStructureBigEndian<UNICOS_Superblock>(sector);
UNICOS_Superblock unicosSb = Marshal.ByteArrayToStructureBigEndian<UNICOS_Superblock>(sector);
DicConsole.DebugWriteLine("UNICOS plugin", "magic = 0x{0:X16} (expected 0x{1:X16})", unicosSb.s_magic,
UNICOS_MAGIC);
@@ -89,15 +88,13 @@ namespace DiscImageChef.Filesystems
information = "";
if(imagePlugin.Info.SectorSize < 512) return;
UNICOS_Superblock unicosSb = new UNICOS_Superblock();
uint sbSize = (uint)(Marshal.SizeOf(unicosSb) / imagePlugin.Info.SectorSize);
if(Marshal.SizeOf(unicosSb) % imagePlugin.Info.SectorSize != 0) sbSize++;
uint sbSize = (uint)(Marshal.SizeOf<UNICOS_Superblock>() / imagePlugin.Info.SectorSize);
if(Marshal.SizeOf<UNICOS_Superblock>() % imagePlugin.Info.SectorSize != 0) sbSize++;
byte[] sector = imagePlugin.ReadSectors(partition.Start, sbSize);
if(sector.Length < Marshal.SizeOf(unicosSb)) return;
if(sector.Length < Marshal.SizeOf<UNICOS_Superblock>()) return;
unicosSb = Helpers.Marshal.ByteArrayToStructureBigEndian<UNICOS_Superblock>(sector);
UNICOS_Superblock unicosSb = Marshal.ByteArrayToStructureBigEndian<UNICOS_Superblock>(sector);
if(unicosSb.s_magic != UNICOS_MAGIC) return;