General code refactor and reformat.

This commit is contained in:
2018-12-31 13:17:27 +00:00
parent 06a27f18b0
commit e2bbb9994f
72 changed files with 433 additions and 897 deletions

View File

@@ -315,10 +315,7 @@ namespace DiscImageChef.Decoders.Floppy
// Not Apple ][ GCR?
}
public static RawSector MarshalSector(byte[] data, int offset = 0)
{
return MarshalSector(data, out _, offset);
}
public static RawSector MarshalSector(byte[] data, int offset = 0) => MarshalSector(data, out _, offset);
public static RawSector MarshalSector(byte[] data, out int endOffset, int offset = 0)
{
@@ -351,7 +348,9 @@ namespace DiscImageChef.Decoders.Floppy
sector = new[] {data[position + 7], data[position + 8]},
checksum = new[] {data[position + 9], data[position + 10]},
epilogue = new[]
{data[position + 11], data[position + 12], data[position + 13]}
{
data[position + 11], data[position + 12], data[position + 13]
}
}
};
@@ -492,10 +491,7 @@ namespace DiscImageChef.Decoders.Floppy
return raw.ToArray();
}
public static RawTrack MarshalTrack(byte[] data, int offset = 0)
{
return MarshalTrack(data, out _, offset);
}
public static RawTrack MarshalTrack(byte[] data, int offset = 0) => MarshalTrack(data, out _, offset);
public static RawTrack MarshalTrack(byte[] data, out int endOffset, int offset = 0)
{
@@ -565,10 +561,7 @@ namespace DiscImageChef.Decoders.Floppy
return raw.ToArray();
}
public static List<RawTrack> MarshalDisk(byte[] data, int offset = 0)
{
return MarshalDisk(data, out _, offset);
}
public static List<RawTrack> MarshalDisk(byte[] data, int offset = 0) => MarshalDisk(data, out _, offset);
public static List<RawTrack> MarshalDisk(byte[] data, out int endOffset, int offset = 0)
{
@@ -589,10 +582,7 @@ namespace DiscImageChef.Decoders.Floppy
return tracks;
}
public static byte[] MarshalDisk(List<RawTrack> disk)
{
return MarshalDisk(disk.ToArray());
}
public static byte[] MarshalDisk(List<RawTrack> disk) => MarshalDisk(disk.ToArray());
public static byte[] MarshalDisk(RawTrack[] disk)
{

View File

@@ -228,10 +228,7 @@ namespace DiscImageChef.Decoders.Floppy
// Not Apple Sony GCR?
}
public static RawSector MarshalSector(byte[] data, int offset = 0)
{
return MarshalSector(data, out _, offset);
}
public static RawSector MarshalSector(byte[] data, int offset = 0) => MarshalSector(data, out _, offset);
public static RawSector MarshalSector(byte[] data, out int endOffset, int offset = 0)
{
@@ -384,10 +381,7 @@ namespace DiscImageChef.Decoders.Floppy
return raw.ToArray();
}
public static RawTrack MarshalTrack(byte[] data, int offset = 0)
{
return MarshalTrack(data, out _, offset);
}
public static RawTrack MarshalTrack(byte[] data, int offset = 0) => MarshalTrack(data, out _, offset);
public static RawTrack MarshalTrack(byte[] data, out int endOffset, int offset = 0)
{
@@ -453,10 +447,7 @@ namespace DiscImageChef.Decoders.Floppy
return raw.ToArray();
}
public static List<RawTrack> MarshalDisk(byte[] data, int offset = 0)
{
return MarshalDisk(data, out _, offset);
}
public static List<RawTrack> MarshalDisk(byte[] data, int offset = 0) => MarshalDisk(data, out _, offset);
public static List<RawTrack> MarshalDisk(byte[] data, out int endOffset, int offset = 0)
{
@@ -477,10 +468,7 @@ namespace DiscImageChef.Decoders.Floppy
return tracks;
}
public static byte[] MarshalDisk(List<RawTrack> disk)
{
return MarshalDisk(disk.ToArray());
}
public static byte[] MarshalDisk(List<RawTrack> disk) => MarshalDisk(disk.ToArray());
public static byte[] MarshalDisk(RawTrack[] disk)
{