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

Convert if to return statements.

Browse Source
This commit is contained in:
Natalia Portillo
2022-11-13 20:54:01 +00:00
parent a8a74f385a
commit c316cef523
11 changed files with 24 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Aaru.CommonTypes

Submodule Aaru.CommonTypes updated: df78159688...a9fdbe5585

10
Aaru.Devices/Device/ScsiCommands/SPC.cs
View File

@@ -394,13 +394,9 @@ public partial class Device
/// <param name="timeout">Timeout in seconds.</param>
/// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
/// <param name="prevent"><c>true</c> to prevent medium removal, <c>false</c> to allow it.</param>
public bool SpcPreventAllowMediumRemoval(out byte[] senseBuffer, bool prevent, uint timeout, out double duration)
{
if(prevent)
return SpcPreventAllowMediumRemoval(out senseBuffer, ScsiPreventAllowMode.Prevent, timeout, out duration);
return SpcPreventAllowMediumRemoval(out senseBuffer, ScsiPreventAllowMode.Allow, timeout, out duration);
}
public bool SpcPreventAllowMediumRemoval(out byte[] senseBuffer, bool prevent, uint timeout, out double duration) =>
prevent ? SpcPreventAllowMediumRemoval(out senseBuffer, ScsiPreventAllowMode.Prevent, timeout, out duration)
: SpcPreventAllowMediumRemoval(out senseBuffer, ScsiPreventAllowMode.Allow, timeout, out duration);
/// <summary>Sends the SPC PREVENT ALLOW MEDIUM REMOVAL command</summary>
/// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>

7
Aaru.Filesystems/QNX4.cs
View File

@@ -100,13 +100,10 @@ public sealed class QNX4 : IFilesystem
return false;
// Check inodes are in use
if((qnxSb.rootDir.di_status & 0x01) != 0x01 ||
(qnxSb.inode.di_status & 0x01) != 0x01 ||
(qnxSb.boot.di_status & 0x01) != 0x01)
return false;
return (qnxSb.rootDir.di_status & 0x01) == 0x01 && (qnxSb.inode.di_status & 0x01) == 0x01 &&
(qnxSb.boot.di_status & 0x01) == 0x01;
// All hail filesystems without identification marks
return true;
}
/// <inheritdoc />

9
Aaru.Images/BlindWrite4/Read.cs
View File

@@ -1212,13 +1212,8 @@ public sealed partial class BlindWrite4
}
/// <inheritdoc />
public List<Track> GetSessionTracks(Session session)
{
if(Sessions.Contains(session))
return GetSessionTracks(session.Sequence);
return null;
}
public List<Track> GetSessionTracks(Session session) =>
Sessions.Contains(session) ? GetSessionTracks(session.Sequence) : null;
/// <inheritdoc />
public List<Track> GetSessionTracks(ushort session) => Tracks.Where(track => track.Session == session).ToList();

9
Aaru.Images/BlindWrite5/Read.cs
View File

@@ -2132,13 +2132,8 @@ public sealed partial class BlindWrite5
}
/// <inheritdoc />
public List<Track> GetSessionTracks(Session session)
{
if(Sessions.Contains(session))
return GetSessionTracks(session.Sequence);
return null;
}
public List<Track> GetSessionTracks(Session session) =>
Sessions.Contains(session) ? GetSessionTracks(session.Sequence) : null;
/// <inheritdoc />
public List<Track> GetSessionTracks(ushort session) =>

8
Aaru.Images/CDRDAO/Read.cs
View File

@@ -1492,11 +1492,5 @@ public sealed partial class Cdrdao
public List<Track> GetSessionTracks(Session session) => GetSessionTracks(session.Sequence);
/// <inheritdoc />
public List<Track> GetSessionTracks(ushort session)
{
if(session == 1)
return Tracks;
return null;
}
public List<Track> GetSessionTracks(ushort session) => session == 1 ? Tracks : null;
}

9
Aaru.Images/CDRWin/Read.cs
View File

@@ -2355,13 +2355,8 @@ public sealed partial class CdrWin
}
/// <inheritdoc />
public List<Track> GetSessionTracks(Session session)
{
if(_discImage.Sessions.Contains(session))
return GetSessionTracks(session.Sequence);
return null;
}
public List<Track> GetSessionTracks(Session session) =>
_discImage.Sessions.Contains(session) ? GetSessionTracks(session.Sequence) : null;
/// <inheritdoc />
public List<Track> GetSessionTracks(ushort session) =>

9
Aaru.Images/CloneCD/Read.cs
View File

@@ -1364,13 +1364,8 @@ public sealed partial class CloneCd
}
/// <inheritdoc />
public List<Track> GetSessionTracks(Session session)
{
if(Sessions.Contains(session))
return GetSessionTracks(session.Sequence);
return null;
}
public List<Track> GetSessionTracks(Session session) =>
Sessions.Contains(session) ? GetSessionTracks(session.Sequence) : null;
/// <inheritdoc />
public List<Track> GetSessionTracks(ushort session) => Tracks.Where(track => track.Session == session).ToList();

9
Aaru.Images/DiscJuggler/Read.cs
View File

@@ -1342,13 +1342,8 @@ public sealed partial class DiscJuggler
}
/// <inheritdoc />
public List<Track> GetSessionTracks(Session session)
{
if(Sessions.Contains(session))
return GetSessionTracks(session.Sequence);
return null;
}
public List<Track> GetSessionTracks(Session session) =>
Sessions.Contains(session) ? GetSessionTracks(session.Sequence) : null;
/// <inheritdoc />
public List<Track> GetSessionTracks(ushort session) => Tracks.Where(track => track.Session == session).ToList();

9
Aaru.Images/GDI/Read.cs
View File

@@ -877,13 +877,8 @@ public sealed partial class Gdi
}
/// <inheritdoc />
public List<Track> GetSessionTracks(Session session)
{
if(_discImage.Sessions.Contains(session))
return GetSessionTracks(session.Sequence);
return null;
}
public List<Track> GetSessionTracks(Session session) =>
_discImage.Sessions.Contains(session) ? GetSessionTracks(session.Sequence) : null;
/// <inheritdoc />
public List<Track> GetSessionTracks(ushort session)

25
Aaru.Images/ZZZRawImage/Helpers.cs
View File

@@ -61,11 +61,8 @@ public sealed partial class ZZZRawImage
case 116480: return MediaType.Apple32SS;
case 133120: return MediaType.ATARI_525_ED;
case 143360: return MediaType.Apple33SS;
case 163840:
if(_imageInfo.SectorSize == 256)
return MediaType.ACORN_525_SS_DD_40;
case 163840: return _imageInfo.SectorSize == 256 ? MediaType.ACORN_525_SS_DD_40 : MediaType.DOS_525_SS_DD_8;
return MediaType.DOS_525_SS_DD_8;
case 184320: return MediaType.DOS_525_SS_DD_9;
case 204800: return MediaType.ACORN_525_SS_SD_80;
case 232960: return MediaType.Apple32DS;
@@ -77,21 +74,12 @@ public sealed partial class ZZZRawImage
case 315392: return MediaType.MetaFloppy_Mod_II;
case 322560: return MediaType.Apricot_35;
case 325632: return MediaType.ECMA_70;
case 327680:
if(_imageInfo.SectorSize == 256)
return MediaType.ACORN_525_SS_DD_80;
case 327680: return _imageInfo.SectorSize == 256 ? MediaType.ACORN_525_SS_DD_80 : MediaType.DOS_525_DS_DD_8;
return MediaType.DOS_525_DS_DD_8;
case 368640:
if(_extension == ".st")
return MediaType.DOS_35_SS_DD_9;
case 368640: return _extension == ".st" ? MediaType.DOS_35_SS_DD_9 : MediaType.DOS_525_DS_DD_9;
return MediaType.DOS_525_DS_DD_9;
case 409600:
if(_extension == ".st")
return MediaType.ATARI_35_SS_DD;
case 409600: return _extension == ".st" ? MediaType.ATARI_35_SS_DD : MediaType.AppleSonySS;
return MediaType.AppleSonySS;
case 450560: return MediaType.ATARI_35_SS_DD_11;
case 495872: return MediaType.IBM43FD_128;
case 512512: return MediaType.ECMA_59;
@@ -110,11 +98,8 @@ public sealed partial class ZZZRawImage
};
case 839680: return MediaType.FDFORMAT_35_DD;
case 901120:
if(_extension == ".st")
return MediaType.ATARI_35_DS_DD_11;
case 901120: return _extension == ".st" ? MediaType.ATARI_35_DS_DD_11 : MediaType.CBM_AMIGA_35_DD;
return MediaType.CBM_AMIGA_35_DD;
case 988416: return MediaType.IBM43FD_256;
case 995072: return MediaType.IBM53FD_256;
case 1021696: return MediaType.ECMA_99_26;