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

Naming fixes.

Browse Source
This commit is contained in:
Natalia Portillo
2023-10-05 02:31:59 +01:00
parent 2c955cfc49
commit 546d131124
22 changed files with 112 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Aaru.Checksums

Submodule Aaru.Checksums updated: 86c470a436...04120aa5f4

2
Aaru.CommonTypes

Submodule Aaru.CommonTypes updated: b414db9541...bc36f65180

4
Aaru.Core/Checksum.cs
View File

@@ -130,7 +130,7 @@ public sealed class Checksum
if(enabled.HasFlag(EnableChecksum.Crc16))
{
_crc16Ctx = new CRC16IBMContext();
_crc16Ctx = new CRC16IbmContext();
_crc16Pkt = new HashPacket
{
@@ -539,7 +539,7 @@ public sealed class Checksum
if(enabled.HasFlag(EnableChecksum.Crc16))
{
crc16CtxData = new CRC16IBMContext();
crc16CtxData = new CRC16IbmContext();
var crc16PktData = new HashPacket
{

8
Aaru.Core/Devices/Dumping/CompactDisc/Pregap.cs
View File

@@ -264,7 +264,7 @@ partial class Dump
if(bcd == false)
BinaryToBcdQ(subBuf);
CRC16CCITTContext.Data(subBuf, 10, out crc);
CRC16CcittContext.Data(subBuf, 10, out crc);
AaruConsole.DebugWriteLine(PREGAP_MODULE_NAME,
Localization.Core.
@@ -302,7 +302,7 @@ partial class Dump
}
}
CRC16CCITTContext.Data(subBuf, 10, out crc);
CRC16CcittContext.Data(subBuf, 10, out crc);
crcOk = crc[0] == subBuf[10] && crc[1] == subBuf[11];
@@ -365,7 +365,7 @@ partial class Dump
if(bcd == false)
BinaryToBcdQ(subBuf);
CRC16CCITTContext.Data(subBuf, 10, out crc);
CRC16CcittContext.Data(subBuf, 10, out crc);
AaruConsole.DebugWriteLine(PREGAP_MODULE_NAME,
Localization.Core.
@@ -403,7 +403,7 @@ partial class Dump
}
}
CRC16CCITTContext.Data(subBuf, 10, out crc);
CRC16CcittContext.Data(subBuf, 10, out crc);
crcOk = crc[0] == subBuf[10] && crc[1] == subBuf[11];

64
Aaru.Core/Media/CompactDisc.cs
View File

@@ -109,7 +109,7 @@ public static class CompactDisc
Array.Copy(deSub, subPos + 12, q, 0, 12);
// Check Q CRC
CRC16CCITTContext.Data(q, 10, out byte[] crc);
CRC16CcittContext.Data(q, 10, out byte[] crc);
bool crcOk = crc[0] == q[10] && crc[1] == q[11];
// Start considering P to be OK
@@ -320,7 +320,7 @@ public static class CompactDisc
var q = new byte[12];
Array.Copy(deSub, subPos + 12, q, 0, 12);
CRC16CCITTContext.Data(q, 10, out byte[] crc);
CRC16CcittContext.Data(q, 10, out byte[] crc);
bool crcOk = crc[0] == q[10] && crc[1] == q[11];
switch(q[0] & 0x3)
@@ -806,7 +806,7 @@ public static class CompactDisc
var cdTextPack1Crc = BigEndianBitConverter.ToUInt16(cdTextPack1, 16);
var cdTextPack1ForCrc = new byte[16];
Array.Copy(cdTextPack1, 0, cdTextPack1ForCrc, 0, 16);
ushort calculatedCdtp1Crc = CRC16CCITTContext.Calculate(cdTextPack1ForCrc);
ushort calculatedCdtp1Crc = CRC16CcittContext.Calculate(cdTextPack1ForCrc);
if(cdTextPack1Crc != calculatedCdtp1Crc && cdTextPack1Crc != 0)
status = false;
@@ -817,7 +817,7 @@ public static class CompactDisc
var cdTextPack2Crc = BigEndianBitConverter.ToUInt16(cdTextPack2, 16);
var cdTextPack2ForCrc = new byte[16];
Array.Copy(cdTextPack2, 0, cdTextPack2ForCrc, 0, 16);
ushort calculatedCdtp2Crc = CRC16CCITTContext.Calculate(cdTextPack2ForCrc);
ushort calculatedCdtp2Crc = CRC16CcittContext.Calculate(cdTextPack2ForCrc);
if(cdTextPack2Crc != calculatedCdtp2Crc && cdTextPack2Crc != 0)
status = false;
@@ -828,7 +828,7 @@ public static class CompactDisc
var cdTextPack3Crc = BigEndianBitConverter.ToUInt16(cdTextPack3, 16);
var cdTextPack3ForCrc = new byte[16];
Array.Copy(cdTextPack3, 0, cdTextPack3ForCrc, 0, 16);
ushort calculatedCdtp3Crc = CRC16CCITTContext.Calculate(cdTextPack3ForCrc);
ushort calculatedCdtp3Crc = CRC16CcittContext.Calculate(cdTextPack3ForCrc);
if(cdTextPack3Crc != calculatedCdtp3Crc && cdTextPack3Crc != 0)
status = false;
@@ -840,7 +840,7 @@ public static class CompactDisc
var cdTextPack4Crc = BigEndianBitConverter.ToUInt16(cdTextPack4, 16);
var cdTextPack4ForCrc = new byte[16];
Array.Copy(cdTextPack4, 0, cdTextPack4ForCrc, 0, 16);
ushort calculatedCdtp4Crc = CRC16CCITTContext.Calculate(cdTextPack4ForCrc);
ushort calculatedCdtp4Crc = CRC16CcittContext.Calculate(cdTextPack4ForCrc);
if(cdTextPack4Crc == calculatedCdtp4Crc || cdTextPack4Crc == 0)
return status;
@@ -888,10 +888,10 @@ public static class CompactDisc
Array.Copy(deSub, subPos + 12 - 96, preQ, 0, 12);
Array.Copy(deSub, subPos + 12 + 96, nextQ, 0, 12);
CRC16CCITTContext.Data(preQ, 10, out byte[] preCrc);
CRC16CcittContext.Data(preQ, 10, out byte[] preCrc);
bool preCrcOk = preCrc[0] == preQ[10] && preCrc[1] == preQ[11];
CRC16CCITTContext.Data(nextQ, 10, out byte[] nextCrc);
CRC16CcittContext.Data(nextQ, 10, out byte[] nextCrc);
bool nextCrcOk = nextCrc[0] == nextQ[10] && nextCrc[1] == nextQ[11];
fixedAdr = false;
@@ -903,7 +903,7 @@ public static class CompactDisc
fixedAdr = true;
}
CRC16CCITTContext.Data(q, 10, out byte[] qCrc);
CRC16CcittContext.Data(q, 10, out byte[] qCrc);
bool status = qCrc[0] == q[10] && qCrc[1] == q[11];
if(fixedAdr && status)
@@ -913,7 +913,7 @@ public static class CompactDisc
// Try Q-Mode 1
q[0] = (byte)((q[0] & 0xF0) + 1);
CRC16CCITTContext.Data(q, 10, out qCrc);
CRC16CcittContext.Data(q, 10, out qCrc);
status = qCrc[0] == q[10] && qCrc[1] == q[11];
if(status)
@@ -925,7 +925,7 @@ public static class CompactDisc
// Try Q-Mode 2
q[0] = (byte)((q[0] & 0xF0) + 2);
CRC16CCITTContext.Data(q, 10, out qCrc);
CRC16CcittContext.Data(q, 10, out qCrc);
status = qCrc[0] == q[10] && qCrc[1] == q[11];
if(status)
@@ -937,7 +937,7 @@ public static class CompactDisc
// Try Q-Mode 3
q[0] = (byte)((q[0] & 0xF0) + 3);
CRC16CCITTContext.Data(q, 10, out qCrc);
CRC16CcittContext.Data(q, 10, out qCrc);
status = qCrc[0] == q[10] && qCrc[1] == q[11];
if(status)
@@ -956,7 +956,7 @@ public static class CompactDisc
{
q[0] = (byte)((q[0] & 0x03) + (preQ[0] & 0xF0));
CRC16CCITTContext.Data(q, 10, out qCrc);
CRC16CcittContext.Data(q, 10, out qCrc);
status = qCrc[0] == q[10] && qCrc[1] == q[11];
if(status)
@@ -974,7 +974,7 @@ public static class CompactDisc
{
q[0] = (byte)((q[0] & 0x03) + (nextQ[0] & 0xF0));
CRC16CCITTContext.Data(q, 10, out qCrc);
CRC16CcittContext.Data(q, 10, out qCrc);
status = qCrc[0] == q[10] && qCrc[1] == q[11];
if(status)
@@ -1005,7 +1005,7 @@ public static class CompactDisc
q[6] = 0;
fixedZero = true;
CRC16CCITTContext.Data(q, 10, out qCrc);
CRC16CcittContext.Data(q, 10, out qCrc);
status = qCrc[0] == q[10] && qCrc[1] == q[11];
if(status)
@@ -1019,7 +1019,7 @@ public static class CompactDisc
q[1] = preQ[1];
fixedTno = true;
CRC16CCITTContext.Data(q, 10, out qCrc);
CRC16CcittContext.Data(q, 10, out qCrc);
status = qCrc[0] == q[10] && qCrc[1] == q[11];
if(status)
@@ -1034,7 +1034,7 @@ public static class CompactDisc
q[2] = preQ[2];
fixedIndex = true;
CRC16CCITTContext.Data(q, 10, out qCrc);
CRC16CcittContext.Data(q, 10, out qCrc);
status = qCrc[0] == q[10] && qCrc[1] == q[11];
if(status)
@@ -1111,7 +1111,7 @@ public static class CompactDisc
fixedRelPos = true;
CRC16CCITTContext.Data(q, 10, out qCrc);
CRC16CcittContext.Data(q, 10, out qCrc);
status = qCrc[0] == q[10] && qCrc[1] == q[11];
if(status)
@@ -1170,7 +1170,7 @@ public static class CompactDisc
fixedRelPos = true;
CRC16CCITTContext.Data(q, 10, out qCrc);
CRC16CcittContext.Data(q, 10, out qCrc);
status = qCrc[0] == q[10] && qCrc[1] == q[11];
if(status)
@@ -1226,7 +1226,7 @@ public static class CompactDisc
fixedAbsPos = true;
CRC16CCITTContext.Data(q, 10, out qCrc);
CRC16CcittContext.Data(q, 10, out qCrc);
status = qCrc[0] == q[10] && qCrc[1] == q[11];
if(status)
@@ -1285,7 +1285,7 @@ public static class CompactDisc
fixedAbsPos = true;
CRC16CCITTContext.Data(q, 10, out qCrc);
CRC16CcittContext.Data(q, 10, out qCrc);
status = qCrc[0] == q[10] && qCrc[1] == q[11];
if(status)
@@ -1293,7 +1293,7 @@ public static class CompactDisc
}
}
CRC16CCITTContext.Data(q, 10, out qCrc);
CRC16CcittContext.Data(q, 10, out qCrc);
status = qCrc[0] == q[10] && qCrc[1] == q[11];
// Game Over
@@ -1324,7 +1324,7 @@ public static class CompactDisc
if(q[0] != preQ[0] || q[1] != preQ[1] || q[2] != preQ[2] || q[6] != 0 || !absOk || !relOk)
return false;
CRC16CCITTContext.Data(q, 10, out qCrc);
CRC16CcittContext.Data(q, 10, out qCrc);
q[10] = qCrc[0];
q[11] = qCrc[1];
@@ -1357,7 +1357,7 @@ public static class CompactDisc
if(q[0] != nextQ[0] || q[1] != nextQ[1] || q[2] != nextQ[2] || q[6] != 0 || !absOk || !relOk)
return false;
CRC16CCITTContext.Data(q, 10, out qCrc);
CRC16CcittContext.Data(q, 10, out qCrc);
q[10] = qCrc[0];
q[11] = qCrc[1];
@@ -1393,7 +1393,7 @@ public static class CompactDisc
fixedAbsPos = true;
CRC16CCITTContext.Data(q, 10, out qCrc);
CRC16CcittContext.Data(q, 10, out qCrc);
status = qCrc[0] == q[10] && qCrc[1] == q[11];
if(status)
@@ -1420,7 +1420,7 @@ public static class CompactDisc
fixedAbsPos = true;
CRC16CCITTContext.Data(q, 10, out qCrc);
CRC16CcittContext.Data(q, 10, out qCrc);
status = qCrc[0] == q[10] && qCrc[1] == q[11];
if(status)
@@ -1442,7 +1442,7 @@ public static class CompactDisc
fixedMcn = true;
CRC16CCITTContext.Data(q, 10, out qCrc);
CRC16CcittContext.Data(q, 10, out qCrc);
status = qCrc[0] == q[10] && qCrc[1] == q[11];
if(status)
@@ -1452,7 +1452,7 @@ public static class CompactDisc
if(!fixCrc || !nextCrcOk || !preCrcOk)
return false;
CRC16CCITTContext.Data(q, 10, out qCrc);
CRC16CcittContext.Data(q, 10, out qCrc);
q[10] = qCrc[0];
q[11] = qCrc[1];
@@ -1484,7 +1484,7 @@ public static class CompactDisc
fixedAbsPos = true;
CRC16CCITTContext.Data(q, 10, out qCrc);
CRC16CcittContext.Data(q, 10, out qCrc);
status = qCrc[0] == q[10] && qCrc[1] == q[11];
if(status)
@@ -1511,7 +1511,7 @@ public static class CompactDisc
fixedAbsPos = true;
CRC16CCITTContext.Data(q, 10, out qCrc);
CRC16CcittContext.Data(q, 10, out qCrc);
status = qCrc[0] == q[10] && qCrc[1] == q[11];
if(status)
@@ -1539,7 +1539,7 @@ public static class CompactDisc
fixedIsrc = true;
CRC16CCITTContext.Data(q, 10, out qCrc);
CRC16CcittContext.Data(q, 10, out qCrc);
status = qCrc[0] == q[10] && qCrc[1] == q[11];
if(status)
@@ -1549,7 +1549,7 @@ public static class CompactDisc
if(!fixCrc || !nextCrcOk || !preCrcOk)
return false;
CRC16CCITTContext.Data(q, 10, out qCrc);
CRC16CcittContext.Data(q, 10, out qCrc);
q[10] = qCrc[0];
q[11] = qCrc[1];

2
Aaru.Decoders

Submodule Aaru.Decoders updated: bb23889fd5...85628a9827

6
Aaru.Filesystems/FFS/Structs.cs
View File

@@ -39,10 +39,10 @@ namespace Aaru.Filesystems;
[SuppressMessage("ReSharper", "InconsistentNaming")]
public sealed partial class FFSPlugin
{
#region Nested type: csum
#region Nested type: Checksum
[StructLayout(LayoutKind.Sequential, Pack = 1)]
struct csum
struct Checksum
{
/// <summary>number of directories</summary>
public int cs_ndir;
@@ -190,7 +190,7 @@ public sealed partial class FFSPlugin
public readonly int fs_fpg;
/* this data must be re-computed after crashes */
/// <summary>cylinder summary information</summary>
public csum fs_old_cstotal;
public Checksum fs_old_cstotal;
/* these fields are cleared at mount time */
/// <summary>super block modified flag</summary>
public readonly sbyte fs_fmod;

2
Aaru.Filesystems/dump/Consts.cs
View File

@@ -39,7 +39,7 @@ namespace Aaru.Filesystems;
/// <summary>Implements identification of a dump(8) image (virtual filesystem on a file)</summary>
[SuppressMessage("ReSharper", "InconsistentNaming")]
[SuppressMessage("ReSharper", "UnusedMember.Local")]
public sealed partial class dump
public sealed partial class Dump
{
/// <summary>Magic number for old dump</summary>
const ushort OFS_MAGIC = 60011;

2
Aaru.Filesystems/dump/Info.cs
View File

@@ -46,7 +46,7 @@ namespace Aaru.Filesystems;
/// <summary>Implements identification of a dump(8) image (virtual filesystem on a file)</summary>
[SuppressMessage("ReSharper", "InconsistentNaming")]
[SuppressMessage("ReSharper", "UnusedMember.Local")]
public sealed partial class dump
public sealed partial class Dump
{
#region IFilesystem Members

8
Aaru.Filesystems/dump/Structs.cs
View File

@@ -40,12 +40,12 @@ namespace Aaru.Filesystems;
/// <summary>Implements identification of a dump(8) image (virtual filesystem on a file)</summary>
[SuppressMessage("ReSharper", "InconsistentNaming")]
[SuppressMessage("ReSharper", "UnusedMember.Local")]
public sealed partial class dump
public sealed partial class Dump
{
#region Nested type: dinode
#region Nested type: DInode
[StructLayout(LayoutKind.Sequential, Pack = 1)]
readonly struct dinode
readonly struct DInode
{
public readonly ushort di_mode; /* 0: IFMT, permissions; see below. */
public readonly short di_nlink; /* 2: File link count. */
@@ -85,7 +85,7 @@ public sealed partial class dump
public readonly uint c_inumber; /* number of inode */
public readonly int c_magic; /* magic number (see above) */
public readonly int c_checksum; /* record checksum */
public readonly dinode c_dinode; /* ownership and mode of inode */
public readonly DInode c_dinode; /* ownership and mode of inode */
public readonly int c_count; /* number of valid c_addr entries */
[MarshalAs(UnmanagedType.ByValArray, SizeConst = TP_NINDIR)]
public readonly byte[] c_addr; /* 1 => data; 0 => hole in inode */

2
Aaru.Filesystems/dump/dump.cs
View File

@@ -41,7 +41,7 @@ namespace Aaru.Filesystems;
/// <summary>Implements identification of a dump(8) image (virtual filesystem on a file)</summary>
[SuppressMessage("ReSharper", "InconsistentNaming")]
[SuppressMessage("ReSharper", "UnusedMember.Local")]
public sealed partial class dump : IFilesystem
public sealed partial class Dump : IFilesystem
{
const string MODULE_NAME = "dump(8) plugin";

4
Aaru.Images/A2R/Constants.cs
View File

@@ -37,12 +37,12 @@ namespace Aaru.DiscImages;
[SuppressMessage("ReSharper", "UnusedType.Global")]
public sealed partial class A2R
{
readonly byte[] _a2RV2Signature =
readonly byte[] _a2Rv2Signature =
{
0x41, 0x32, 0x52, 0x32 // A2R2
};
readonly byte[] _a2RV3Signature =
readonly byte[] _a2Rv3Signature =
{
0x41, 0x32, 0x52, 0x33 // A2R3
};

2
Aaru.Images/A2R/Identify.cs
View File

@@ -56,7 +56,7 @@ public sealed partial class A2R
stream.EnsureRead(hdr, 0, 4);
return _a2RV2Signature.SequenceEqual(hdr) || _a2RV3Signature.SequenceEqual(hdr);
return _a2Rv2Signature.SequenceEqual(hdr) || _a2Rv3Signature.SequenceEqual(hdr);
}
#endregion

2
Aaru.Images/CPCDSK/Read.cs
View File

@@ -232,7 +232,7 @@ public sealed partial class Cpcdsk
amForCrc[6] = trackInfo.sectorsInfo[k - 1].id;
amForCrc[7] = (byte)trackInfo.sectorsInfo[k - 1].size;
CRC16IBMContext.Data(amForCrc, 8, out byte[] amCrc);
CRC16IbmContext.Data(amForCrc, 8, out byte[] amCrc);
var addressMark = new byte[22];
Array.Copy(amForCrc, 0, addressMark, 12, 8);

2
Aaru.Images/WCDiskImage/Read.cs
View File

@@ -273,7 +273,7 @@ public sealed partial class WCDiskImage
case SectorFlag.Normal: /* read a normal sector and store it in cache */
stream.EnsureRead(sectorData, 0, 512);
_sectorCache[(cyl, head, sect)] = sectorData;
CRC16IBMContext.Data(sectorData, 512, out byte[] crc);
CRC16IbmContext.Data(sectorData, 512, out byte[] crc);
var calculatedCRC = (short)(256 * crc[0] | crc[1]);
/*
AaruConsole.DebugWriteLine(MODULE_NAME, "CHS {0},{1},{2}: Regular sector, stored CRC=0x{3:x4}, calculated CRC=0x{4:x4}",

60
Aaru.Partitions/VTOC.cs
View File

@@ -172,8 +172,8 @@ public sealed class VTOC : IPartition
if(errno != ErrorNumber.NoError)
return false;
var vtoc = new vtoc();
var vtocOld = new vtocold();
var vtoc = new Vtoc();
var vtocOld = new VTocOld();
magic = BitConverter.ToUInt32(vtocsector, 0);
if(magic is VTOC_SANE or VTOC_ENAS)
@@ -182,10 +182,10 @@ public sealed class VTOC : IPartition
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.New_VTOC_found_at_0, pdloc + sectorOffset + 1);
if(magic == VTOC_SANE)
vtoc = Marshal.ByteArrayToStructureLittleEndian<vtoc>(vtocsector);
vtoc = Marshal.ByteArrayToStructureLittleEndian<Vtoc>(vtocsector);
else
{
vtoc = Marshal.ByteArrayToStructureBigEndian<vtoc>(vtocsector);
vtoc = Marshal.ByteArrayToStructureBigEndian<Vtoc>(vtocsector);
for(var i = 0; i < vtoc.v_part.Length; i++)
{
@@ -209,10 +209,10 @@ public sealed class VTOC : IPartition
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.Old_VTOC_found_at_0, pdloc + sectorOffset + 1);
if(magic == VTOC_SANE)
vtocOld = Marshal.ByteArrayToStructureLittleEndian<vtocold>(vtocsector);
vtocOld = Marshal.ByteArrayToStructureLittleEndian<VTocOld>(vtocsector);
else
{
vtocOld = Marshal.ByteArrayToStructureBigEndian<vtocold>(vtocsector);
vtocOld = Marshal.ByteArrayToStructureBigEndian<VTocOld>(vtocsector);
for(var i = 0; i < vtocOld.v_part.Length; i++)
{
@@ -262,10 +262,10 @@ public sealed class VTOC : IPartition
AaruConsole.DebugWriteLine(MODULE_NAME, Localization.New_VTOC_found);
if(magic == VTOC_SANE)
vtoc = Marshal.ByteArrayToStructureLittleEndian<vtoc>(vtocsector);
vtoc = Marshal.ByteArrayToStructureLittleEndian<Vtoc>(vtocsector);
else
{
vtoc = Marshal.ByteArrayToStructureBigEndian<vtoc>(vtocsector);
vtoc = Marshal.ByteArrayToStructureBigEndian<Vtoc>(vtocsector);
for(var i = 0; i < vtoc.v_part.Length; i++)
{
@@ -347,7 +347,7 @@ public sealed class VTOC : IPartition
}
uint bps;
partition[] parts;
VtocPartition[] parts;
int[] timestamps;
if(useOld)
@@ -459,21 +459,6 @@ public sealed class VTOC : IPartition
_ => string.Format(Localization.Unknown_TAG_0, type)
};
#region Nested type: partition
[StructLayout(LayoutKind.Sequential, Pack = 1)]
// ReSharper disable once InconsistentNaming
struct partition
{
public pTag p_tag; /*ID tag of partition*/
public pFlag p_flag; /*permision flags*/
public int p_start; /*start sector no of partition*/
public int p_size; /*# of blocks in partition*/
}
#endregion
#region Nested type: PDInfo
[StructLayout(LayoutKind.Sequential, Pack = 1)]
@@ -625,12 +610,12 @@ public sealed class VTOC : IPartition
#endregion
#region Nested type: vtoc
#region Nested type: Vtoc
[StructLayout(LayoutKind.Sequential, Pack = 1)]
// ReSharper disable once InconsistentNaming
struct vtoc
struct Vtoc
{
public readonly uint v_sanity; /*to verify vtoc sanity*/
public readonly uint v_version; /*layout version*/
@@ -641,19 +626,19 @@ public sealed class VTOC : IPartition
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 10)]
public readonly uint[] v_reserved; /*free space*/
[MarshalAs(UnmanagedType.ByValArray, SizeConst = V_NUMPAR)]
public readonly partition[] v_part; /*partition headers*/
public readonly VtocPartition[] v_part; /*partition headers*/
[MarshalAs(UnmanagedType.ByValArray, SizeConst = V_NUMPAR)]
public readonly int[] timestamp; /* SCSI time stamp */
}
#endregion
#region Nested type: vtocold
#region Nested type: VTocOld
[StructLayout(LayoutKind.Sequential, Pack = 1)]
// ReSharper disable once InconsistentNaming
struct vtocold
struct VTocOld
{
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
public readonly uint[] v_bootinfo; /*info needed by mboot*/
@@ -666,10 +651,25 @@ public sealed class VTOC : IPartition
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 10)]
public readonly uint[] v_reserved; /*free space*/
[MarshalAs(UnmanagedType.ByValArray, SizeConst = V_NUMPAR)]
public readonly partition[] v_part; /*partition headers*/
public readonly VtocPartition[] v_part; /*partition headers*/
[MarshalAs(UnmanagedType.ByValArray, SizeConst = V_NUMPAR)]
public readonly int[] timestamp; /* SCSI time stamp */
}
#endregion
#region Nested type: VtocPartition
[StructLayout(LayoutKind.Sequential, Pack = 1)]
// ReSharper disable once InconsistentNaming
struct VtocPartition
{
public pTag p_tag; /*ID tag of partition*/
public pFlag p_flag; /*permision flags*/
public int p_start; /*start sector no of partition*/
public int p_size; /*# of blocks in partition*/
}
#endregion
}

20
Aaru.Tests/Checksums/CRC16CCITT.cs
View File

@@ -74,14 +74,14 @@ public class Crc16Ccitt
fs.EnsureRead(data, 0, 1048576);
fs.Close();
fs.Dispose();
CRC16CCITTContext.Data(data, out byte[] result);
CRC16CcittContext.Data(data, out byte[] result);
result.Should().BeEquivalentTo(_expectedEmpty);
}
[Test]
public void EmptyFile()
{
byte[] result = CRC16CCITTContext.File(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "empty"));
byte[] result = CRC16CcittContext.File(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "empty"));
result.Should().BeEquivalentTo(_expectedEmpty);
}
@@ -97,7 +97,7 @@ public class Crc16Ccitt
fs.EnsureRead(data, 0, 1048576);
fs.Close();
fs.Dispose();
var ctx = new CRC16CCITTContext();
var ctx = new CRC16CcittContext();
ctx.Update(data);
byte[] result = ctx.Final();
result.Should().BeEquivalentTo(_expectedEmpty);
@@ -114,7 +114,7 @@ public class Crc16Ccitt
fs.EnsureRead(data, 0, 15);
fs.Close();
fs.Dispose();
var ctx = new CRC16CCITTContext();
var ctx = new CRC16CcittContext();
ctx.Update(data);
byte[] result = ctx.Final();
result.Should().BeEquivalentTo(_expectedRandom15);
@@ -131,7 +131,7 @@ public class Crc16Ccitt
fs.EnsureRead(data, 0, 2352);
fs.Close();
fs.Dispose();
var ctx = new CRC16CCITTContext();
var ctx = new CRC16CcittContext();
ctx.Update(data);
byte[] result = ctx.Final();
result.Should().BeEquivalentTo(_expectedRandom2352);
@@ -148,7 +148,7 @@ public class Crc16Ccitt
fs.EnsureRead(data, 0, 31);
fs.Close();
fs.Dispose();
var ctx = new CRC16CCITTContext();
var ctx = new CRC16CcittContext();
ctx.Update(data);
byte[] result = ctx.Final();
result.Should().BeEquivalentTo(_expectedRandom31);
@@ -165,7 +165,7 @@ public class Crc16Ccitt
fs.EnsureRead(data, 0, 63);
fs.Close();
fs.Dispose();
var ctx = new CRC16CCITTContext();
var ctx = new CRC16CcittContext();
ctx.Update(data);
byte[] result = ctx.Final();
result.Should().BeEquivalentTo(_expectedRandom63);
@@ -182,14 +182,14 @@ public class Crc16Ccitt
fs.EnsureRead(data, 0, 1048576);
fs.Close();
fs.Dispose();
CRC16CCITTContext.Data(data, out byte[] result);
CRC16CcittContext.Data(data, out byte[] result);
result.Should().BeEquivalentTo(_expectedRandom);
}
[Test]
public void RandomFile()
{
byte[] result = CRC16CCITTContext.File(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "random"));
byte[] result = CRC16CcittContext.File(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "random"));
result.Should().BeEquivalentTo(_expectedRandom);
}
@@ -205,7 +205,7 @@ public class Crc16Ccitt
fs.EnsureRead(data, 0, 1048576);
fs.Close();
fs.Dispose();
var ctx = new CRC16CCITTContext();
var ctx = new CRC16CcittContext();
ctx.Update(data);
byte[] result = ctx.Final();
result.Should().BeEquivalentTo(_expectedRandom);

20
Aaru.Tests/Checksums/CRC16IBM.cs
View File

@@ -75,14 +75,14 @@ public class Crc16Ibm
fs.EnsureRead(data, 0, 1048576);
fs.Close();
fs.Dispose();
CRC16IBMContext.Data(data, out byte[] result);
CRC16IbmContext.Data(data, out byte[] result);
result.Should().BeEquivalentTo(_expectedEmpty);
}
[Test]
public void EmptyFile()
{
byte[] result = CRC16IBMContext.File(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "empty"));
byte[] result = CRC16IbmContext.File(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "empty"));
result.Should().BeEquivalentTo(_expectedEmpty);
}
@@ -98,7 +98,7 @@ public class Crc16Ibm
fs.EnsureRead(data, 0, 1048576);
fs.Close();
fs.Dispose();
IChecksum ctx = new CRC16IBMContext();
IChecksum ctx = new CRC16IbmContext();
ctx.Update(data);
byte[] result = ctx.Final();
result.Should().BeEquivalentTo(_expectedEmpty);
@@ -115,7 +115,7 @@ public class Crc16Ibm
fs.EnsureRead(data, 0, 15);
fs.Close();
fs.Dispose();
IChecksum ctx = new CRC16IBMContext();
IChecksum ctx = new CRC16IbmContext();
ctx.Update(data);
byte[] result = ctx.Final();
result.Should().BeEquivalentTo(_expectedRandom15);
@@ -132,7 +132,7 @@ public class Crc16Ibm
fs.EnsureRead(data, 0, 2352);
fs.Close();
fs.Dispose();
IChecksum ctx = new CRC16IBMContext();
IChecksum ctx = new CRC16IbmContext();
ctx.Update(data);
byte[] result = ctx.Final();
result.Should().BeEquivalentTo(_expectedRandom2352);
@@ -149,7 +149,7 @@ public class Crc16Ibm
fs.EnsureRead(data, 0, 31);
fs.Close();
fs.Dispose();
IChecksum ctx = new CRC16IBMContext();
IChecksum ctx = new CRC16IbmContext();
ctx.Update(data);
byte[] result = ctx.Final();
result.Should().BeEquivalentTo(_expectedRandom31);
@@ -166,7 +166,7 @@ public class Crc16Ibm
fs.EnsureRead(data, 0, 63);
fs.Close();
fs.Dispose();
IChecksum ctx = new CRC16IBMContext();
IChecksum ctx = new CRC16IbmContext();
ctx.Update(data);
byte[] result = ctx.Final();
result.Should().BeEquivalentTo(_expectedRandom63);
@@ -183,14 +183,14 @@ public class Crc16Ibm
fs.EnsureRead(data, 0, 1048576);
fs.Close();
fs.Dispose();
CRC16IBMContext.Data(data, out byte[] result);
CRC16IbmContext.Data(data, out byte[] result);
result.Should().BeEquivalentTo(_expectedRandom);
}
[Test]
public void RandomFile()
{
byte[] result = CRC16IBMContext.File(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "random"));
byte[] result = CRC16IbmContext.File(Path.Combine(Consts.TestFilesRoot, "Checksum test files", "random"));
result.Should().BeEquivalentTo(_expectedRandom);
}
@@ -206,7 +206,7 @@ public class Crc16Ibm
fs.EnsureRead(data, 0, 1048576);
fs.Close();
fs.Dispose();
IChecksum ctx = new CRC16IBMContext();
IChecksum ctx = new CRC16IbmContext();
ctx.Update(data);
byte[] result = ctx.Final();
result.Should().BeEquivalentTo(_expectedRandom);

2
Aaru.Tests/Images/cdrdao/cooked/nosub.cs
View File

@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.cdrdao.cooked;
[TestFixture]
[SuppressMessage("ReSharper", "InconsistentNaming")]
public class nosub : OpticalMediaImageTest
public class NoSub : OpticalMediaImageTest
{
public override string DataFolder =>
Path.Combine(Consts.TestFilesRoot, "Media image formats", "cdrdao", "cooked", "nosub");

2
Aaru.Tests/Images/cdrdao/cooked/rw.cs
View File

@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.cdrdao.cooked;
[TestFixture]
[SuppressMessage("ReSharper", "InconsistentNaming")]
public class rw : OpticalMediaImageTest
public class Rw : OpticalMediaImageTest
{
public override string DataFolder =>
Path.Combine(Consts.TestFilesRoot, "Media image formats", "cdrdao", "cooked", "rw");

2
Aaru.Tests/Images/cdrdao/raw/nosub.cs
View File

@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.cdrdao.raw;
[TestFixture]
[SuppressMessage("ReSharper", "InconsistentNaming")]
public class nosub : OpticalMediaImageTest
public class NoSub : OpticalMediaImageTest
{
public override string DataFolder =>
Path.Combine(Consts.TestFilesRoot, "Media image formats", "cdrdao", "raw", "nosub");

2
Aaru.Tests/Images/cdrdao/raw/rw.cs
View File

@@ -37,7 +37,7 @@ namespace Aaru.Tests.Images.cdrdao.raw;
[TestFixture]
[SuppressMessage("ReSharper", "InconsistentNaming")]
public class rw : OpticalMediaImageTest
public class Rw : OpticalMediaImageTest
{
public override string DataFolder =>
Path.Combine(Consts.TestFilesRoot, "Media image formats", "cdrdao", "raw", "rw");