aaru-dps/Aaru.Server
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.Server.git synced 2025-12-16 19:24:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

REFACTOR: Expression is always 'true' or always 'false'.

Browse Source
This commit is contained in:
Natalia Portillo
2017-12-21 17:34:47 +00:00
parent ccd9930884
commit 9a404acef4
19 changed files with 104 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
DiscImageChef.Core/Devices/Dumping/CompactDisc.cs
View File

@@ -169,23 +169,22 @@ namespace DiscImageChef.Core.Devices.Dumping
bool allFirstSessionTracksAreAudio = true;
bool hasVideoTrack = false;
if(toc.HasValue)
foreach(FullTOC.TrackDataDescriptor track in toc.Value.TrackDescriptors)
foreach(FullTOC.TrackDataDescriptor track in toc.Value.TrackDescriptors)
{
if(track.TNO == 1 && ((TOC_CONTROL)(track.CONTROL & 0x0D) == TOC_CONTROL.DataTrack ||
(TOC_CONTROL)(track.CONTROL & 0x0D) ==
TOC_CONTROL.DataTrackIncremental)) allFirstSessionTracksAreAudio &= firstTrackLastSession != 1;
if((TOC_CONTROL)(track.CONTROL & 0x0D) == TOC_CONTROL.DataTrack ||
(TOC_CONTROL)(track.CONTROL & 0x0D) == TOC_CONTROL.DataTrackIncremental)
{
if(track.TNO == 1 && ((TOC_CONTROL)(track.CONTROL & 0x0D) == TOC_CONTROL.DataTrack ||
(TOC_CONTROL)(track.CONTROL & 0x0D) ==
TOC_CONTROL.DataTrackIncremental)) allFirstSessionTracksAreAudio &= firstTrackLastSession != 1;
if((TOC_CONTROL)(track.CONTROL & 0x0D) == TOC_CONTROL.DataTrack ||
(TOC_CONTROL)(track.CONTROL & 0x0D) == TOC_CONTROL.DataTrackIncremental)
{
hasDataTrack = true;
allFirstSessionTracksAreAudio &= track.TNO >= firstTrackLastSession;
}
else hasAudioTrack = true;
hasVideoTrack |= track.ADR == 4;
hasDataTrack = true;
allFirstSessionTracksAreAudio &= track.TNO >= firstTrackLastSession;
}
else hasAudioTrack = true;
hasVideoTrack |= track.ADR == 4;
}
if(hasDataTrack && hasAudioTrack && allFirstSessionTracksAreAudio && sessions == 2)
dskType = MediaType.CDPLUS;

4
DiscImageChef.Core/Devices/Report/SCSI/General.cs
View File

@@ -608,7 +608,7 @@ namespace DiscImageChef.Core.Devices.Report.SCSI
if(pressedKey.Key == ConsoleKey.Y)
{
for(ushort i = (ushort)mediaTest.BlockSize; i <= ushort.MaxValue; i++)
for(ushort i = (ushort)mediaTest.BlockSize; true; i++)
{
DicConsole.Write("\rTrying to READ LONG with a size of {0} bytes...", i);
sense = dev.ReadLong10(out buffer, out senseBuffer, false, false, 0, i,
@@ -877,7 +877,7 @@ namespace DiscImageChef.Core.Devices.Report.SCSI
if(pressedKey.Key == ConsoleKey.Y)
{
for(ushort i = (ushort)report.SCSI.ReadCapabilities.BlockSize; i <= ushort.MaxValue; i++)
for(ushort i = (ushort)report.SCSI.ReadCapabilities.BlockSize; true; i++)
{
DicConsole.Write("\rTrying to READ LONG with a size of {0} bytes...", i);
sense = dev.ReadLong10(out buffer, out senseBuffer, false, false, 0, i, timeout,

2
DiscImageChef.Core/Devices/Report/SCSI/MMC.cs
View File

@@ -1907,7 +1907,7 @@ namespace DiscImageChef.Core.Devices.Report.SCSI
if(pressedKey.Key == ConsoleKey.Y)
{
for(ushort i = (ushort)mediaTest.BlockSize; i <= ushort.MaxValue; i++)
for(ushort i = (ushort)mediaTest.BlockSize; true; i++)
{
DicConsole.Write("\rTrying to READ LONG with a size of {0} bytes...", i);
sense = dev.ReadLong10(out buffer, out senseBuffer, false, false, 0, i, timeout,