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

[Refactor] Remove redundant braces and apply brace style.

Browse Source
This commit is contained in:
Natalia Portillo
2024-05-01 04:51:19 +01:00
parent 8e0e249b9f
commit b34179ebfe
30 changed files with 68 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Aaru.Core/Devices/Dumping/Sbc/Data.cs
View File

@@ -134,9 +134,7 @@ partial class Dump
CSS_CPRM.TitleKey? titleKey = CSS.DecodeTitleKey(tmpBuf, dvdDecrypt.BusKey);
if(titleKey.HasValue)
{
outputFormat.WriteSectorTag([titleKey.Value.CMI], i + j, SectorTagType.DvdSectorCmi);
}
else
continue;

5
Aaru.Core/Devices/Dumping/Sbc/Optical.cs
View File

@@ -182,9 +182,8 @@ partial class Dump
writtenExtents.Add(0, blocks - 1);
foreach(Tuple<ulong, ulong> blank in blankExtents.ToArray())
{
for(ulong b = blank.Item1; b <= blank.Item2; b++) writtenExtents.Remove(b);
}
for(ulong b = blank.Item1; b <= blank.Item2; b++)
writtenExtents.Remove(b);
}
if(writtenExtents.Count == 0)

5
Aaru.Decoders/MMC/CSD.cs
View File

@@ -300,9 +300,8 @@ public static partial class Decoders
unit = "";
for(int cl = 0, mask = 1; cl <= 11; cl++, mask <<= 1)
{
if((csd.Classes & mask) == mask) unit += $" {cl}";
}
if((csd.Classes & mask) == mask)
unit += $" {cl}";
sb.AppendFormat("\t" + Localization.Device_support_command_classes_0, unit).AppendLine();

5
Aaru.Decoders/SecureDigital/CSD.cs
View File

@@ -290,9 +290,8 @@ public static partial class Decoders
unit = "";
for(int cl = 0, mask = 1; cl <= 11; cl++, mask <<= 1)
{
if((csd.Classes & mask) == mask) unit += $" {cl}";
}
if((csd.Classes & mask) == mask)
unit += $" {cl}";
sb.AppendFormat("\t" + Localization.Device_support_command_classes_0, unit).AppendLine();

10
Aaru.Decoders/Xbox/DMI.cs
View File

@@ -52,14 +52,12 @@ public static class DMI
// Catalogue number is two letters, five numbers, one letter
for(var i = 12; i < 14; i++)
{
if(dmi[i] < 0x41 || dmi[i] > 0x5A) return false;
}
if(dmi[i] < 0x41 || dmi[i] > 0x5A)
return false;
for(var i = 14; i < 19; i++)
{
if(dmi[i] < 0x30 || dmi[i] > 0x39) return false;
}
if(dmi[i] < 0x30 || dmi[i] > 0x39)
return false;
if(dmi[19] < 0x41 || dmi[19] > 0x5A) return false;

10
Aaru.Devices/Device/Constructor.cs
View File

@@ -181,9 +181,8 @@ public partial class Device
if(string.IsNullOrEmpty(dev.Serial))
dev.Serial = dev.UsbSerialString;
else
{
foreach(char c in dev.Serial.Where(c => !char.IsControl(c))) dev.Serial = $"{dev.Serial}{c:X2}";
}
foreach(char c in dev.Serial.Where(c => !char.IsControl(c)))
dev.Serial = $"{dev.Serial}{c:X2}";
}
if(dev.IsFireWire)
@@ -195,9 +194,8 @@ public partial class Device
if(string.IsNullOrEmpty(dev.Serial))
dev.Serial = $"{dev.FirewireGuid:X16}";
else
{
foreach(char c in dev.Serial.Where(c => !char.IsControl(c))) dev.Serial = $"{dev.Serial}{c:X2}";
}
foreach(char c in dev.Serial.Where(c => !char.IsControl(c)))
dev.Serial = $"{dev.Serial}{c:X2}";
}
// Some optical drives are not getting the correct serial, and IDENTIFY PACKET DEVICE is blocked without

5
Aaru.Filesystems/CBM/Super.cs
View File

@@ -241,9 +241,8 @@ public sealed partial class CBM
_statfs.FreeFiles--;
for(var i = 0; i < dirEntry.name.Length; i++)
{
if(dirEntry.name[i] == 0xA0) dirEntry.name[i] = 0;
}
if(dirEntry.name[i] == 0xA0)
dirEntry.name[i] = 0;
string name = StringHandlers.CToString(dirEntry.name, encoding);

20
Aaru.Filesystems/CPM/Dir.cs
View File

@@ -115,14 +115,12 @@ public sealed partial class CPM
if((entry.statusUser & 0x7F) < 0x20)
{
for(var f = 0; f < 8; f++)
{
if(entry.filename[f] < 0x20 && entry.filename[f] != 0x00) return false;
}
if(entry.filename[f] < 0x20 && entry.filename[f] != 0x00)
return false;
for(var e = 0; e < 3; e++)
{
if(entry.extension[e] < 0x20 && entry.extension[e] != 0x00) return false;
}
if(entry.extension[e] < 0x20 && entry.extension[e] != 0x00)
return false;
if(!ArrayHelpers.ArrayIsNullOrWhiteSpace(entry.filename)) fileCount++;
}
@@ -133,14 +131,12 @@ public sealed partial class CPM
case 0x20:
{
for(var f = 0; f < 8; f++)
{
if(entry.filename[f] < 0x20 && entry.filename[f] != 0x00) return false;
}
if(entry.filename[f] < 0x20 && entry.filename[f] != 0x00)
return false;
for(var e = 0; e < 3; e++)
{
if(entry.extension[e] < 0x20 && entry.extension[e] != 0x00) return false;
}
if(entry.extension[e] < 0x20 && entry.extension[e] != 0x00)
return false;
_label = Encoding.ASCII.GetString(directory, off + 1, 11).Trim();
_labelCreationDate = new byte[4];

5
Aaru.Filesystems/CPM/Info.cs
View File

@@ -1025,9 +1025,8 @@ public sealed partial class CPM
// Complement of the directory bytes if needed
if(def.complement)
{
for(var b = 0; b < directory.Length; b++) directory[b] = (byte)(~directory[b] & 0xFF);
}
for(var b = 0; b < directory.Length; b++)
directory[b] = (byte)(~directory[b] & 0xFF);
// Check the directory
if(CheckDir(directory))

10
Aaru.Filesystems/FAT/Super.cs
View File

@@ -193,9 +193,8 @@ public sealed partial class FAT
};
if((fat32Bpb.flags & 0xF8) == 0x00)
{
if((fat32Bpb.flags & 0x01) == 0x01) Metadata.Dirty = true;
}
if((fat32Bpb.flags & 0x01) == 0x01)
Metadata.Dirty = true;
if((fat32Bpb.mirror_flags & 0x80) == 0x80) _useFirstFat = (fat32Bpb.mirror_flags & 0xF) != 1;
@@ -457,9 +456,8 @@ public sealed partial class FAT
if(fakeBpb.signature is 0x28 or 0x29 || andosOemCorrect)
{
if((fakeBpb.flags & 0xF8) == 0x00)
{
if((fakeBpb.flags & 0x01) == 0x01) Metadata.Dirty = true;
}
if((fakeBpb.flags & 0x01) == 0x01)
Metadata.Dirty = true;
if(fakeBpb.signature == 0x29 || andosOemCorrect)
{

10
Aaru.Filesystems/FATX/Super.cs
View File

@@ -156,9 +156,8 @@ public sealed partial class XboxFatPlugin
_fat32 = MemoryMarshal.Cast<byte, uint>(buffer).ToArray();
if(!_littleEndian)
{
for(var i = 0; i < _fat32.Length; i++) _fat32[i] = Swapping.Swap(_fat32[i]);
}
for(var i = 0; i < _fat32.Length; i++)
_fat32[i] = Swapping.Swap(_fat32[i]);
AaruConsole.DebugWriteLine(MODULE_NAME, "fat32[0] == FATX32_ID = {0}", _fat32[0] == FATX32_ID);
@@ -188,9 +187,8 @@ public sealed partial class XboxFatPlugin
_fat16 = MemoryMarshal.Cast<byte, ushort>(buffer).ToArray();
if(!_littleEndian)
{
for(var i = 0; i < _fat16.Length; i++) _fat16[i] = Swapping.Swap(_fat16[i]);
}
for(var i = 0; i < _fat16.Length; i++)
_fat16[i] = Swapping.Swap(_fat16[i]);
AaruConsole.DebugWriteLine(MODULE_NAME, "fat16[0] == FATX16_ID = {0}", _fat16[0] == FATX16_ID);

10
Aaru.Filesystems/LisaFS/File.cs
View File

@@ -227,9 +227,8 @@ public sealed partial class LisaFS
if(!_mounted || !_debug) return ErrorNumber.AccessDenied;
if(fileId is > 4 or <= 0)
{
if(fileId != FILEID_BOOT_SIGNED && fileId != FILEID_LOADER_SIGNED) return ErrorNumber.InvalidArgument;
}
if(fileId != FILEID_BOOT_SIGNED && fileId != FILEID_LOADER_SIGNED)
return ErrorNumber.InvalidArgument;
if(_systemFileCache.TryGetValue(fileId, out buf) && !tags) return ErrorNumber.NoError;
@@ -443,9 +442,8 @@ public sealed partial class LisaFS
if(!tags)
{
if(_fileSizeCache.TryGetValue(fileId, out int realSize))
{
if(realSize > temp.Length) AaruConsole.ErrorWriteLine(Localization.File_0_gets_truncated, fileId);
}
if(realSize > temp.Length)
AaruConsole.ErrorWriteLine(Localization.File_0_gets_truncated, fileId);
buf = temp;

4
Aaru.Gui/ViewModels/Windows/ImageConvertViewModel.cs
View File

@@ -1433,12 +1433,8 @@ public sealed class ImageConvertViewModel : ViewModelBase
}
if(trackFlags.Count > 0)
{
foreach(KeyValuePair<byte, byte> flags in trackFlags)
{
outputOptical.WriteSectorTag([flags.Value], flags.Key, SectorTagType.CdTrackFlags);
}
}
if(mcn != null) outputOptical.WriteMediaTag(Encoding.UTF8.GetBytes(mcn), MediaTagType.CD_MCN);
}

5
Aaru.Images/A2R/Helpers.cs
View File

@@ -110,10 +110,7 @@ public sealed partial class A2R
{
uint over = ticks / 255;
if(over == 0)
{
return [(byte)ticks];
}
if(over == 0) return [(byte)ticks];
var expanded = new byte[over + 1];

10
Aaru.Images/AaruFormat/Write.cs
View File

@@ -1926,9 +1926,8 @@ public sealed partial class AaruFormat
// Fill FLAC block
if(remaining != 0)
{
for(var r = 0; r < remaining * 4; r++) _writingBuffer[_writingBufferPosition + r] = 0;
}
for(var r = 0; r < remaining * 4; r++)
_writingBuffer[_writingBufferPosition + r] = 0;
compressedLength = FLAC.EncodeBuffer(_writingBuffer,
_compressedBuffer,
@@ -2720,9 +2719,8 @@ public sealed partial class AaruFormat
// Fill FLAC block
if(remaining != 0)
{
for(var r = 0; r < remaining * 4; r++) _writingBuffer[_writingBufferPosition + r] = 0;
}
for(var r = 0; r < remaining * 4; r++)
_writingBuffer[_writingBufferPosition + r] = 0;
compressedLength = FLAC.EncodeBuffer(_writingBuffer,
_compressedBuffer,

5
Aaru.Images/Apridisk/Read.cs
View File

@@ -207,9 +207,8 @@ public sealed partial class Apridisk
for(ushort cyl = 0; cyl < _imageInfo.Cylinders; cyl++)
{
for(ushort head = 0; head < _imageInfo.Heads; head++)
{
if(spts[cyl][head] < spt) spt = spts[cyl][head];
}
if(spts[cyl][head] < spt)
spt = spts[cyl][head];
}
_imageInfo.SectorsPerTrack = spt;

5
Aaru.Images/BLU/Identify.cs
View File

@@ -65,9 +65,8 @@ public sealed partial class Blu
tmpHdr.BytesPerBlock = BigEndianBitConverter.ToUInt16(header, 0x15);
for(var i = 0; i < 0xD; i++)
{
if(tmpHdr.DeviceName[i] < 0x20) return false;
}
if(tmpHdr.DeviceName[i] < 0x20)
return false;
return (tmpHdr.BytesPerBlock & 0xFE00) == 0x200;
}

5
Aaru.Images/BLU/Read.cs
View File

@@ -73,9 +73,8 @@ public sealed partial class Blu
AaruConsole.DebugWriteLine(MODULE_NAME, "ImageHeader.bytesPerBlock = {0}", _imageHeader.BytesPerBlock);
for(var i = 0; i < 0xD; i++)
{
if(_imageHeader.DeviceName[i] < 0x20) return ErrorNumber.InvalidArgument;
}
if(_imageHeader.DeviceName[i] < 0x20)
return ErrorNumber.InvalidArgument;
if((_imageHeader.BytesPerBlock & 0xFE00) != 0x200) return ErrorNumber.InvalidArgument;

5
Aaru.Images/CPCDSK/Identify.cs
View File

@@ -57,9 +57,8 @@ public sealed partial class Cpcdsk
int pos;
for(pos = 0; pos < 254; pos++)
{
if(headerB[pos] == 0x0D && headerB[pos + 1] == 0x0A) break;
}
if(headerB[pos] == 0x0D && headerB[pos + 1] == 0x0A)
break;
if(pos >= 254) return false;

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

@@ -63,9 +63,8 @@ public sealed partial class Cpcdsk
int pos;
for(pos = 0; pos < 254; pos++)
{
if(headerB[pos] == 0x0D && headerB[pos + 1] == 0x0A) break;
}
if(headerB[pos] == 0x0D && headerB[pos + 1] == 0x0A)
break;
if(pos >= 254) return ErrorNumber.InvalidArgument;

5
Aaru.Images/HDCopy/Helpers.cs
View File

@@ -82,9 +82,8 @@ public sealed partial class HdCopy
// all other tracks must be either present (=1) or absent (=0)
for(var i = 0; i < 2 * numTracks; i++)
{
if(fheader.trackMap[i] > 1) return false;
}
if(fheader.trackMap[i] > 1)
return false;
/* return success */
fhdr = fheader;

5
Aaru.Images/SuperCardPro/Helpers.cs
View File

@@ -75,10 +75,7 @@ public sealed partial class SuperCardPro
{
uint over = ticks / 255;
if(over == 0)
{
return [(byte)ticks];
}
if(over == 0) return [(byte)ticks];
var expanded = new byte[over + 1];

5
Aaru.Images/T98/Identify.cs
View File

@@ -56,9 +56,8 @@ public sealed partial class T98
stream.EnsureRead(hdrB, 0, hdrB.Length);
for(var i = 4; i < 256; i++)
{
if(hdrB[i] != 0) return false;
}
if(hdrB[i] != 0)
return false;
var cylinders = BitConverter.ToInt32(hdrB, 0);

5
Aaru.Images/T98/Read.cs
View File

@@ -57,9 +57,8 @@ public sealed partial class T98
stream.EnsureRead(hdrB, 0, hdrB.Length);
for(var i = 4; i < 256; i++)
{
if(hdrB[i] != 0) return ErrorNumber.InvalidArgument;
}
if(hdrB[i] != 0)
return ErrorNumber.InvalidArgument;
var cylinders = BitConverter.ToInt32(hdrB, 0);

5
Aaru.Images/TeleDisk/Read.cs
View File

@@ -188,9 +188,8 @@ public sealed partial class TeleDisk
for(var i = 0; i < _commentBlock.Length; i++)
// Replace NULLs, used by TeleDisk as newline markers, with UNIX newline marker
{
if(_commentBlock[i] == 0x00) _commentBlock[i] = 0x0A;
}
if(_commentBlock[i] == 0x00)
_commentBlock[i] = 0x0A;
_imageInfo.Comments = Encoding.ASCII.GetString(_commentBlock);

5
Aaru.Images/VHD/Write.cs
View File

@@ -352,9 +352,8 @@ public sealed partial class Vhd
}
for(var i = 0; i < length; i++)
{
if(!WriteSector(data[(i * 512)..(i * 512 + 512)], sectorAddress + (ulong)i)) return false;
}
if(!WriteSector(data[(i * 512)..(i * 512 + 512)], sectorAddress + (ulong)i))
return false;
return true;
}

4
Aaru.Tests/Issues/OpticalImageConvertIssueTest.cs
View File

@@ -406,12 +406,8 @@ public abstract class OpticalImageConvertIssueTest
}
if(trackFlags.Count > 0)
{
foreach((byte track, byte flags) in trackFlags)
{
outputOptical.WriteSectorTag([flags], track, SectorTagType.CdTrackFlags);
}
}
if(mcn != null) outputOptical.WriteMediaTag(Encoding.UTF8.GetBytes(mcn), MediaTagType.CD_MCN);

4
Aaru.Tests/WritableImages/WritableOpticalMediaImageTest.cs
View File

@@ -506,12 +506,8 @@ public abstract class WritableOpticalMediaImageTest : BaseWritableMediaImageTest
}
if(trackFlags.Count > 0)
{
foreach((byte track, byte flags) in trackFlags)
{
outputFormat.WriteSectorTag([flags], track, SectorTagType.CdTrackFlags);
}
}
if(mcn != null) outputFormat.WriteMediaTag(Encoding.UTF8.GetBytes(mcn), MediaTagType.CD_MCN);

4
Aaru/Commands/Image/Convert.cs
View File

@@ -1423,12 +1423,8 @@ sealed class ConvertImageCommand : Command
}
if(trackFlags.Count > 0)
{
foreach((byte track, byte flags) in trackFlags)
{
outputOptical.WriteSectorTag([flags], track, SectorTagType.CdTrackFlags);
}
}
if(mcn != null) outputOptical.WriteMediaTag(Encoding.UTF8.GetBytes(mcn), MediaTagType.CD_MCN);

10
Aaru/Commands/Image/Verify.cs
View File

@@ -446,18 +446,16 @@ sealed class VerifyCommand : Command
if(failingLbas.Count == (int)inputFormat.Info.Sectors)
AaruConsole.VerboseWriteLine($"\t[red]{UI.all_sectors}[/]");
else
{
foreach(ulong t in failingLbas) AaruConsole.VerboseWriteLine("\t{0}", t);
}
foreach(ulong t in failingLbas)
AaruConsole.VerboseWriteLine("\t{0}", t);
AaruConsole.WriteLine($"[yellow3_1]{UI.LBAs_without_checksum}[/]");
if(unknownLbas.Count == (int)inputFormat.Info.Sectors)
AaruConsole.VerboseWriteLine($"\t[yellow3_1]{UI.all_sectors}[/]");
else
{
foreach(ulong t in unknownLbas) AaruConsole.VerboseWriteLine("\t{0}", t);
}
foreach(ulong t in unknownLbas)
AaruConsole.VerboseWriteLine("\t{0}", t);
}
// TODO: Convert to table