mirror of
https://github.com/aaru-dps/Aaru.git
synced 2025-12-16 19:24:25 +00:00
Invert 'if' statement to reduce nesting.
This commit is contained in:
@@ -193,26 +193,26 @@ public sealed class SunDisklabel : IPartition
|
||||
|
||||
for(var i = 0; i < NDKMAP; i++)
|
||||
{
|
||||
if(dkl.dkl_map[i].dkl_cylno > 0 &&
|
||||
dkl.dkl_map[i].dkl_nblk > 0)
|
||||
{
|
||||
var part = new Partition
|
||||
{
|
||||
Size = (ulong)dkl.dkl_map[i].dkl_nblk * DK_LABEL_SIZE,
|
||||
Length = (ulong)(dkl.dkl_map[i].dkl_nblk * DK_LABEL_SIZE / imagePlugin.Info.SectorSize),
|
||||
Sequence = (ulong)i,
|
||||
Offset =
|
||||
((ulong)dkl.dkl_map[i].dkl_cylno * sectorsPerCylinder + sectorOffset) * DK_LABEL_SIZE,
|
||||
Start = ((ulong)dkl.dkl_map[i].dkl_cylno * sectorsPerCylinder + sectorOffset) *
|
||||
DK_LABEL_SIZE / imagePlugin.Info.SectorSize,
|
||||
Type = Localization.SunOS_partition,
|
||||
Scheme = Name
|
||||
};
|
||||
if(dkl.dkl_map[i].dkl_cylno <= 0 ||
|
||||
dkl.dkl_map[i].dkl_nblk <= 0)
|
||||
continue;
|
||||
|
||||
if(part.Start < imagePlugin.Info.Sectors &&
|
||||
part.End <= imagePlugin.Info.Sectors)
|
||||
partitions.Add(part);
|
||||
}
|
||||
var part = new Partition
|
||||
{
|
||||
Size = (ulong)dkl.dkl_map[i].dkl_nblk * DK_LABEL_SIZE,
|
||||
Length = (ulong)(dkl.dkl_map[i].dkl_nblk * DK_LABEL_SIZE / imagePlugin.Info.SectorSize),
|
||||
Sequence = (ulong)i,
|
||||
Offset =
|
||||
((ulong)dkl.dkl_map[i].dkl_cylno * sectorsPerCylinder + sectorOffset) * DK_LABEL_SIZE,
|
||||
Start = ((ulong)dkl.dkl_map[i].dkl_cylno * sectorsPerCylinder + sectorOffset) *
|
||||
DK_LABEL_SIZE / imagePlugin.Info.SectorSize,
|
||||
Type = Localization.SunOS_partition,
|
||||
Scheme = Name
|
||||
};
|
||||
|
||||
if(part.Start < imagePlugin.Info.Sectors &&
|
||||
part.End <= imagePlugin.Info.Sectors)
|
||||
partitions.Add(part);
|
||||
}
|
||||
}
|
||||
else if(useDkl8)
|
||||
@@ -271,35 +271,35 @@ public sealed class SunDisklabel : IPartition
|
||||
|
||||
for(var i = 0; i < dkl8.dkl_vtoc.v_nparts; i++)
|
||||
{
|
||||
if(dkl8.dkl_map[i].dkl_nblk > 0 &&
|
||||
dkl8.dkl_vtoc.v_part[i].p_tag != SunTag.SunEmpty &&
|
||||
dkl8.dkl_vtoc.v_part[i].p_tag != SunTag.SunWholeDisk)
|
||||
if(dkl8.dkl_map[i].dkl_nblk <= 0 ||
|
||||
dkl8.dkl_vtoc.v_part[i].p_tag == SunTag.SunEmpty ||
|
||||
dkl8.dkl_vtoc.v_part[i].p_tag == SunTag.SunWholeDisk)
|
||||
continue;
|
||||
|
||||
var part = new Partition
|
||||
{
|
||||
var part = new Partition
|
||||
{
|
||||
Description = SunFlagsToString(dkl8.dkl_vtoc.v_part[i].p_flag),
|
||||
Size = (ulong)dkl8.dkl_map[i].dkl_nblk * DK_LABEL_SIZE,
|
||||
Length = (ulong)(dkl8.dkl_map[i].dkl_nblk * DK_LABEL_SIZE / imagePlugin.Info.SectorSize),
|
||||
Sequence = (ulong)i,
|
||||
Offset = ((ulong)dkl8.dkl_map[i].dkl_cylno * sectorsPerCylinder + sectorOffset) *
|
||||
DK_LABEL_SIZE,
|
||||
Start = ((ulong)dkl8.dkl_map[i].dkl_cylno * sectorsPerCylinder + sectorOffset) *
|
||||
DK_LABEL_SIZE / imagePlugin.Info.SectorSize,
|
||||
Type = SunIdToString(dkl8.dkl_vtoc.v_part[i].p_tag),
|
||||
Scheme = Name
|
||||
};
|
||||
Description = SunFlagsToString(dkl8.dkl_vtoc.v_part[i].p_flag),
|
||||
Size = (ulong)dkl8.dkl_map[i].dkl_nblk * DK_LABEL_SIZE,
|
||||
Length = (ulong)(dkl8.dkl_map[i].dkl_nblk * DK_LABEL_SIZE / imagePlugin.Info.SectorSize),
|
||||
Sequence = (ulong)i,
|
||||
Offset = ((ulong)dkl8.dkl_map[i].dkl_cylno * sectorsPerCylinder + sectorOffset) *
|
||||
DK_LABEL_SIZE,
|
||||
Start = ((ulong)dkl8.dkl_map[i].dkl_cylno * sectorsPerCylinder + sectorOffset) *
|
||||
DK_LABEL_SIZE / imagePlugin.Info.SectorSize,
|
||||
Type = SunIdToString(dkl8.dkl_vtoc.v_part[i].p_tag),
|
||||
Scheme = Name
|
||||
};
|
||||
|
||||
if(dkl8.dkl_vtoc.v_timestamp[i] != 0)
|
||||
{
|
||||
part.Description += "\n" + string.Format(Localization.Partition_timestamped_on_0,
|
||||
DateHandlers.
|
||||
UnixToDateTime(dkl8.dkl_vtoc.v_timestamp[i]));
|
||||
}
|
||||
|
||||
if(part.Start < imagePlugin.Info.Sectors &&
|
||||
part.End <= imagePlugin.Info.Sectors)
|
||||
partitions.Add(part);
|
||||
if(dkl8.dkl_vtoc.v_timestamp[i] != 0)
|
||||
{
|
||||
part.Description += "\n" + string.Format(Localization.Partition_timestamped_on_0,
|
||||
DateHandlers.
|
||||
UnixToDateTime(dkl8.dkl_vtoc.v_timestamp[i]));
|
||||
}
|
||||
|
||||
if(part.Start < imagePlugin.Info.Sectors &&
|
||||
part.End <= imagePlugin.Info.Sectors)
|
||||
partitions.Add(part);
|
||||
}
|
||||
}
|
||||
else
|
||||
@@ -357,35 +357,35 @@ public sealed class SunDisklabel : IPartition
|
||||
|
||||
for(var i = 0; i < dkl16.dkl_vtoc.v_nparts; i++)
|
||||
{
|
||||
if(dkl16.dkl_vtoc.v_part[i].p_size > 0 &&
|
||||
dkl16.dkl_vtoc.v_part[i].p_tag != SunTag.SunEmpty &&
|
||||
dkl16.dkl_vtoc.v_part[i].p_tag != SunTag.SunWholeDisk)
|
||||
if(dkl16.dkl_vtoc.v_part[i].p_size <= 0 ||
|
||||
dkl16.dkl_vtoc.v_part[i].p_tag == SunTag.SunEmpty ||
|
||||
dkl16.dkl_vtoc.v_part[i].p_tag == SunTag.SunWholeDisk)
|
||||
continue;
|
||||
|
||||
var part = new Partition
|
||||
{
|
||||
var part = new Partition
|
||||
{
|
||||
Description = SunFlagsToString(dkl16.dkl_vtoc.v_part[i].p_flag),
|
||||
Size = (ulong)dkl16.dkl_vtoc.v_part[i].p_size * dkl16.dkl_vtoc.v_sectorsz,
|
||||
Length = (ulong)(dkl16.dkl_vtoc.v_part[i].p_size * dkl16.dkl_vtoc.v_sectorsz /
|
||||
imagePlugin.Info.SectorSize),
|
||||
Sequence = (ulong)i,
|
||||
Offset = ((ulong)dkl16.dkl_vtoc.v_part[i].p_start + sectorOffset) * dkl16.dkl_vtoc.v_sectorsz,
|
||||
Start = ((ulong)dkl16.dkl_vtoc.v_part[i].p_start + sectorOffset) * dkl16.dkl_vtoc.v_sectorsz /
|
||||
imagePlugin.Info.SectorSize,
|
||||
Type = SunIdToString(dkl16.dkl_vtoc.v_part[i].p_tag),
|
||||
Scheme = Name
|
||||
};
|
||||
Description = SunFlagsToString(dkl16.dkl_vtoc.v_part[i].p_flag),
|
||||
Size = (ulong)dkl16.dkl_vtoc.v_part[i].p_size * dkl16.dkl_vtoc.v_sectorsz,
|
||||
Length = (ulong)(dkl16.dkl_vtoc.v_part[i].p_size * dkl16.dkl_vtoc.v_sectorsz /
|
||||
imagePlugin.Info.SectorSize),
|
||||
Sequence = (ulong)i,
|
||||
Offset = ((ulong)dkl16.dkl_vtoc.v_part[i].p_start + sectorOffset) * dkl16.dkl_vtoc.v_sectorsz,
|
||||
Start = ((ulong)dkl16.dkl_vtoc.v_part[i].p_start + sectorOffset) * dkl16.dkl_vtoc.v_sectorsz /
|
||||
imagePlugin.Info.SectorSize,
|
||||
Type = SunIdToString(dkl16.dkl_vtoc.v_part[i].p_tag),
|
||||
Scheme = Name
|
||||
};
|
||||
|
||||
if(dkl16.dkl_vtoc.v_timestamp[i] != 0)
|
||||
{
|
||||
part.Description += "\n" + string.Format(Localization.Partition_timestamped_on_0,
|
||||
DateHandlers.
|
||||
UnixToDateTime(dkl16.dkl_vtoc.v_timestamp[i]));
|
||||
}
|
||||
|
||||
if(part.Start < imagePlugin.Info.Sectors &&
|
||||
part.End <= imagePlugin.Info.Sectors)
|
||||
partitions.Add(part);
|
||||
if(dkl16.dkl_vtoc.v_timestamp[i] != 0)
|
||||
{
|
||||
part.Description += "\n" + string.Format(Localization.Partition_timestamped_on_0,
|
||||
DateHandlers.
|
||||
UnixToDateTime(dkl16.dkl_vtoc.v_timestamp[i]));
|
||||
}
|
||||
|
||||
if(part.Start < imagePlugin.Info.Sectors &&
|
||||
part.End <= imagePlugin.Info.Sectors)
|
||||
partitions.Add(part);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -367,63 +367,63 @@ public sealed class VTOC : IPartition
|
||||
// This means partition starts are absolute, not relative, to the VTOC position
|
||||
for(var i = 0; i < V_NUMPAR; i++)
|
||||
{
|
||||
if(parts[i].p_tag == pTag.V_BACKUP &&
|
||||
(ulong)parts[i].p_start == sectorOffset)
|
||||
{
|
||||
absolute = true;
|
||||
if(parts[i].p_tag != pTag.V_BACKUP ||
|
||||
(ulong)parts[i].p_start != sectorOffset)
|
||||
continue;
|
||||
|
||||
break;
|
||||
}
|
||||
absolute = true;
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
for(var i = 0; i < V_NUMPAR; i++)
|
||||
{
|
||||
if(parts[i].p_tag != pTag.V_UNUSED)
|
||||
if(parts[i].p_tag == pTag.V_UNUSED)
|
||||
continue;
|
||||
|
||||
var part = new Partition
|
||||
{
|
||||
var part = new Partition
|
||||
{
|
||||
Start = (ulong)(parts[i].p_start * bps) / imagePlugin.Info.SectorSize,
|
||||
Length = (ulong)(parts[i].p_size * bps) / imagePlugin.Info.SectorSize,
|
||||
Offset = (ulong)(parts[i].p_start * bps),
|
||||
Size = (ulong)(parts[i].p_size * bps),
|
||||
Sequence = (ulong)i,
|
||||
Type = $"UNIX: {DecodeUnixtag(parts[i].p_tag, !useOld)}",
|
||||
Scheme = Name
|
||||
};
|
||||
Start = (ulong)(parts[i].p_start * bps) / imagePlugin.Info.SectorSize,
|
||||
Length = (ulong)(parts[i].p_size * bps) / imagePlugin.Info.SectorSize,
|
||||
Offset = (ulong)(parts[i].p_start * bps),
|
||||
Size = (ulong)(parts[i].p_size * bps),
|
||||
Sequence = (ulong)i,
|
||||
Type = $"UNIX: {DecodeUnixtag(parts[i].p_tag, !useOld)}",
|
||||
Scheme = Name
|
||||
};
|
||||
|
||||
var info = "";
|
||||
var info = "";
|
||||
|
||||
// Apparently old ones are absolute :?
|
||||
if(!useOld &&
|
||||
!absolute)
|
||||
{
|
||||
part.Start += sectorOffset;
|
||||
part.Offset += sectorOffset * imagePlugin.Info.SectorSize;
|
||||
}
|
||||
|
||||
if(parts[i].p_flag.HasFlag(pFlag.V_VALID))
|
||||
info += Localization.valid;
|
||||
|
||||
if(parts[i].p_flag.HasFlag(pFlag.V_UNMNT))
|
||||
info += Localization._unmountable_;
|
||||
|
||||
if(parts[i].p_flag.HasFlag(pFlag.V_OPEN))
|
||||
info += Localization.open;
|
||||
|
||||
if(parts[i].p_flag.HasFlag(pFlag.V_REMAP))
|
||||
info += Localization.alternate_sector_mapping;
|
||||
|
||||
if(parts[i].p_flag.HasFlag(pFlag.V_RONLY))
|
||||
info += Localization._read_only_;
|
||||
|
||||
if(timestamps[i] != 0)
|
||||
info += string.Format(Localization.created_on_0, DateHandlers.UnixToDateTime(timestamps[i]));
|
||||
|
||||
part.Description = "UNIX slice" + info + ".";
|
||||
|
||||
if(part.End < imagePlugin.Info.Sectors)
|
||||
partitions.Add(part);
|
||||
// Apparently old ones are absolute :?
|
||||
if(!useOld &&
|
||||
!absolute)
|
||||
{
|
||||
part.Start += sectorOffset;
|
||||
part.Offset += sectorOffset * imagePlugin.Info.SectorSize;
|
||||
}
|
||||
|
||||
if(parts[i].p_flag.HasFlag(pFlag.V_VALID))
|
||||
info += Localization.valid;
|
||||
|
||||
if(parts[i].p_flag.HasFlag(pFlag.V_UNMNT))
|
||||
info += Localization._unmountable_;
|
||||
|
||||
if(parts[i].p_flag.HasFlag(pFlag.V_OPEN))
|
||||
info += Localization.open;
|
||||
|
||||
if(parts[i].p_flag.HasFlag(pFlag.V_REMAP))
|
||||
info += Localization.alternate_sector_mapping;
|
||||
|
||||
if(parts[i].p_flag.HasFlag(pFlag.V_RONLY))
|
||||
info += Localization._read_only_;
|
||||
|
||||
if(timestamps[i] != 0)
|
||||
info += string.Format(Localization.created_on_0, DateHandlers.UnixToDateTime(timestamps[i]));
|
||||
|
||||
part.Description = "UNIX slice" + info + ".";
|
||||
|
||||
if(part.End < imagePlugin.Info.Sectors)
|
||||
partitions.Add(part);
|
||||
}
|
||||
|
||||
return partitions.Count > 0;
|
||||
@@ -440,15 +440,15 @@ public sealed class VTOC : IPartition
|
||||
pTag.V_USER => "/usr",
|
||||
pTag.V_BACKUP => Localization.Whole_disk,
|
||||
pTag.V_STAND_OLD => isNew
|
||||
? "Stand"
|
||||
: Localization.Alternate_sector_space,
|
||||
? "Stand"
|
||||
: Localization.Alternate_sector_space,
|
||||
pTag.V_VAR_OLD => isNew ? "/var" : Localization.non_UNIX,
|
||||
pTag.V_HOME_OLD => isNew
|
||||
? "/home"
|
||||
: Localization.Alternate_track_space,
|
||||
? "/home"
|
||||
: Localization.Alternate_track_space,
|
||||
pTag.V_ALTSCTR_OLD => isNew
|
||||
? Localization.Alternate_sector_track
|
||||
: "Stand",
|
||||
? Localization.Alternate_sector_track
|
||||
: "Stand",
|
||||
pTag.V_CACHE => isNew ? Localization.Cache : "/var",
|
||||
pTag.V_RESERVED =>
|
||||
isNew ? Localization.Reserved : "/home",
|
||||
|
||||
Reference in New Issue
Block a user