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

Fix inconsistent naming.

Browse Source
This commit is contained in:
Natalia Portillo
2021-08-17 17:14:39 +01:00
parent 807c7c5313
commit 5c4fd98e74
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Aaru/Commands/Configure.cs
View File

@@ -57,9 +57,9 @@ namespace Aaru.Commands
return DoConfigure(false);
}
internal int DoConfigure(bool _gdprChange)
internal int DoConfigure(bool gdprChange)
{
if(_gdprChange)
if(gdprChange)
{
AaruConsole.
WriteLine("In compliance with the European Union General Data Protection Regulation 2016/679 (GDPR),\n" +

24
Aaru/Commands/Device/Info.cs
View File

@@ -284,30 +284,30 @@ namespace Aaru.Commands.Device
if(decodedIdentify.HasValue)
{
Identify.IdentifyDevice ATAID = decodedIdentify.Value;
Identify.IdentifyDevice ataid = decodedIdentify.Value;
ulong blocks;
if(ATAID.CurrentCylinders > 0 &&
ATAID.CurrentHeads > 0 &&
ATAID.CurrentSectorsPerTrack > 0)
if(ataid.CurrentCylinders > 0 &&
ataid.CurrentHeads > 0 &&
ataid.CurrentSectorsPerTrack > 0)
{
blocks =
(ulong)Math.Max(ATAID.CurrentCylinders * ATAID.CurrentHeads * ATAID.CurrentSectorsPerTrack,
ATAID.CurrentSectors);
(ulong)Math.Max(ataid.CurrentCylinders * ataid.CurrentHeads * ataid.CurrentSectorsPerTrack,
ataid.CurrentSectors);
}
else
{
blocks = (ulong)(ATAID.Cylinders * ATAID.Heads * ATAID.SectorsPerTrack);
blocks = (ulong)(ataid.Cylinders * ataid.Heads * ataid.SectorsPerTrack);
}
if(ATAID.Capabilities.HasFlag(Identify.CapabilitiesBit.LBASupport))
blocks = ATAID.LBASectors;
if(ataid.Capabilities.HasFlag(Identify.CapabilitiesBit.LBASupport))
blocks = ataid.LBASectors;
if(ATAID.CommandSet2.HasFlag(Identify.CommandSetBit2.LBA48))
blocks = ATAID.LBA48Sectors;
if(ataid.CommandSet2.HasFlag(Identify.CommandSetBit2.LBA48))
blocks = ataid.LBA48Sectors;
bool removable = ATAID.GeneralConfiguration.HasFlag(Identify.GeneralConfigurationBit.Removable);
bool removable = ataid.GeneralConfiguration.HasFlag(Identify.GeneralConfigurationBit.Removable);
MediaType mediaType = MediaTypeFromDevice.GetFromAta(dev.Manufacturer, dev.Model, removable,
dev.IsCompactFlash, dev.IsPcmcia, blocks);