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

Code restyling.

Browse Source
This commit is contained in:
Natalia Portillo
2020-02-29 18:03:33 +00:00
parent ad4bfdc0b5
commit 0bc3b5c1fe
7 changed files with 37 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
BitEndian.cs
View File

@@ -42,7 +42,8 @@ namespace Aaru.Helpers
public enum BitEndian public enum BitEndian
{ {
/// <summary>Little-endian, or least significant bit</summary> /// <summary>Little-endian, or least significant bit</summary>
Little, /// <summary>Big-endian, or most significant bit</summary> Little,
/// <summary>Big-endian, or most significant bit</summary>
Big, Big,
/// <summary>PDP-11 endian, little endian except for 32-bit integers where the 16 halves are swapped between them</summary> /// <summary>PDP-11 endian, little endian except for 32-bit integers where the 16 halves are swapped between them</summary>
Pdp Pdp

4
CHS.cs
View File

@@ -42,7 +42,7 @@ namespace Aaru.Helpers
/// <param name="maxSector">Number of sectors per track</param> /// <param name="maxSector">Number of sectors per track</param>
/// <returns></returns> /// <returns></returns>
public static uint ToLBA(uint cyl, uint head, uint sector, uint maxHead, uint maxSector) => public static uint ToLBA(uint cyl, uint head, uint sector, uint maxHead, uint maxSector) =>
maxHead == 0 || maxSector == 0 ? (cyl * 16 + head) * 63 + sector - 1 maxHead == 0 || maxSector == 0 ? ((((cyl * 16) + head) * 63) + sector) - 1
: (cyl * maxHead + head) * maxSector + sector - 1; : ((((cyl * maxHead) + head) * maxSector) + sector) - 1;
} }
} }

2
CountBits.cs
View File

@@ -42,7 +42,7 @@ namespace Aaru.Helpers
number = number - ((number >> 1) & 0x55555555); number = number - ((number >> 1) & 0x55555555);
number = (number & 0x33333333) + ((number >> 2) & 0x33333333); number = (number & 0x33333333) + ((number >> 2) & 0x33333333);
return(int)((((number + (number >> 4)) & 0x0F0F0F0F) * 0x01010101) >> 24); return (int)((((number + (number >> 4)) & 0x0F0F0F0F) * 0x01010101) >> 24);
} }
} }
} }

46
DateHandlers.cs
View File

@@ -108,7 +108,7 @@ namespace Aaru
fourcharvalue[3] = vdDateTime[3]; fourcharvalue[3] = vdDateTime[3];
AaruConsole.DebugWriteLine("ISO9600ToDateTime handler", "year = \"{0}\"", AaruConsole.DebugWriteLine("ISO9600ToDateTime handler", "year = \"{0}\"",
StringHandlers.CToString(fourcharvalue, Encoding.ASCII)); StringHandlers.CToString(fourcharvalue, Encoding.ASCII));
if(!int.TryParse(StringHandlers.CToString(fourcharvalue, Encoding.ASCII), out int year)) if(!int.TryParse(StringHandlers.CToString(fourcharvalue, Encoding.ASCII), out int year))
year = 0; year = 0;
@@ -117,7 +117,7 @@ namespace Aaru
twocharvalue[1] = vdDateTime[5]; twocharvalue[1] = vdDateTime[5];
AaruConsole.DebugWriteLine("ISO9600ToDateTime handler", "month = \"{0}\"", AaruConsole.DebugWriteLine("ISO9600ToDateTime handler", "month = \"{0}\"",
StringHandlers.CToString(twocharvalue, Encoding.ASCII)); StringHandlers.CToString(twocharvalue, Encoding.ASCII));
if(!int.TryParse(StringHandlers.CToString(twocharvalue, Encoding.ASCII), out int month)) if(!int.TryParse(StringHandlers.CToString(twocharvalue, Encoding.ASCII), out int month))
month = 0; month = 0;
@@ -126,7 +126,7 @@ namespace Aaru
twocharvalue[1] = vdDateTime[7]; twocharvalue[1] = vdDateTime[7];
AaruConsole.DebugWriteLine("ISO9600ToDateTime handler", "day = \"{0}\"", AaruConsole.DebugWriteLine("ISO9600ToDateTime handler", "day = \"{0}\"",
StringHandlers.CToString(twocharvalue, Encoding.ASCII)); StringHandlers.CToString(twocharvalue, Encoding.ASCII));
if(!int.TryParse(StringHandlers.CToString(twocharvalue, Encoding.ASCII), out int day)) if(!int.TryParse(StringHandlers.CToString(twocharvalue, Encoding.ASCII), out int day))
day = 0; day = 0;
@@ -135,7 +135,7 @@ namespace Aaru
twocharvalue[1] = vdDateTime[9]; twocharvalue[1] = vdDateTime[9];
AaruConsole.DebugWriteLine("ISO9600ToDateTime handler", "hour = \"{0}\"", AaruConsole.DebugWriteLine("ISO9600ToDateTime handler", "hour = \"{0}\"",
StringHandlers.CToString(twocharvalue, Encoding.ASCII)); StringHandlers.CToString(twocharvalue, Encoding.ASCII));
if(!int.TryParse(StringHandlers.CToString(twocharvalue, Encoding.ASCII), out int hour)) if(!int.TryParse(StringHandlers.CToString(twocharvalue, Encoding.ASCII), out int hour))
hour = 0; hour = 0;
@@ -144,7 +144,7 @@ namespace Aaru
twocharvalue[1] = vdDateTime[11]; twocharvalue[1] = vdDateTime[11];
AaruConsole.DebugWriteLine("ISO9600ToDateTime handler", "minute = \"{0}\"", AaruConsole.DebugWriteLine("ISO9600ToDateTime handler", "minute = \"{0}\"",
StringHandlers.CToString(twocharvalue, Encoding.ASCII)); StringHandlers.CToString(twocharvalue, Encoding.ASCII));
if(!int.TryParse(StringHandlers.CToString(twocharvalue, Encoding.ASCII), out int minute)) if(!int.TryParse(StringHandlers.CToString(twocharvalue, Encoding.ASCII), out int minute))
minute = 0; minute = 0;
@@ -153,7 +153,7 @@ namespace Aaru
twocharvalue[1] = vdDateTime[13]; twocharvalue[1] = vdDateTime[13];
AaruConsole.DebugWriteLine("ISO9600ToDateTime handler", "second = \"{0}\"", AaruConsole.DebugWriteLine("ISO9600ToDateTime handler", "second = \"{0}\"",
StringHandlers.CToString(twocharvalue, Encoding.ASCII)); StringHandlers.CToString(twocharvalue, Encoding.ASCII));
if(!int.TryParse(StringHandlers.CToString(twocharvalue, Encoding.ASCII), out int second)) if(!int.TryParse(StringHandlers.CToString(twocharvalue, Encoding.ASCII), out int second))
second = 0; second = 0;
@@ -162,14 +162,14 @@ namespace Aaru
twocharvalue[1] = vdDateTime[15]; twocharvalue[1] = vdDateTime[15];
AaruConsole.DebugWriteLine("ISO9600ToDateTime handler", "hundredths = \"{0}\"", AaruConsole.DebugWriteLine("ISO9600ToDateTime handler", "hundredths = \"{0}\"",
StringHandlers.CToString(twocharvalue, Encoding.ASCII)); StringHandlers.CToString(twocharvalue, Encoding.ASCII));
if(!int.TryParse(StringHandlers.CToString(twocharvalue, Encoding.ASCII), out int hundredths)) if(!int.TryParse(StringHandlers.CToString(twocharvalue, Encoding.ASCII), out int hundredths))
hundredths = 0; hundredths = 0;
AaruConsole.DebugWriteLine("ISO9600ToDateTime handler", AaruConsole.DebugWriteLine("ISO9600ToDateTime handler",
"decodedDT = new DateTime({0}, {1}, {2}, {3}, {4}, {5}, {6}, DateTimeKind.Unspecified);", "decodedDT = new DateTime({0}, {1}, {2}, {3}, {4}, {5}, {6}, DateTimeKind.Unspecified);",
year, month, day, hour, minute, second, hundredths * 10); year, month, day, hour, minute, second, hundredths * 10);
var decodedDt = new DateTime(year, month, day, hour, minute, second, hundredths * 10, var decodedDt = new DateTime(year, month, day, hour, minute, second, hundredths * 10,
DateTimeKind.Unspecified); DateTimeKind.Unspecified);
@@ -211,8 +211,8 @@ namespace Aaru
int month = dateRecord & 0x000F; int month = dateRecord & 0x000F;
AaruConsole.DebugWriteLine("UCSDPascalToDateTime handler", AaruConsole.DebugWriteLine("UCSDPascalToDateTime handler",
"dateRecord = 0x{0:X4}, year = {1}, month = {2}, day = {3}", dateRecord, year, "dateRecord = 0x{0:X4}, year = {1}, month = {2}, day = {3}", dateRecord, year,
month, day); month, day);
return new DateTime(year, month, day); return new DateTime(year, month, day);
} }
@@ -231,11 +231,11 @@ namespace Aaru
int second = (time & 0x1F) * 2; int second = (time & 0x1F) * 2;
AaruConsole.DebugWriteLine("DOSToDateTime handler", "date = 0x{0:X4}, year = {1}, month = {2}, day = {3}", AaruConsole.DebugWriteLine("DOSToDateTime handler", "date = 0x{0:X4}, year = {1}, month = {2}, day = {3}",
date, year, month, day); date, year, month, day);
AaruConsole.DebugWriteLine("DOSToDateTime handler", AaruConsole.DebugWriteLine("DOSToDateTime handler",
"time = 0x{0:X4}, hour = {1}, minute = {2}, second = {3}", time, hour, minute, "time = 0x{0:X4}, hour = {1}, minute = {2}, second = {3}", time, hour, minute,
second); second);
DateTime dosdate; DateTime dosdate;
@@ -285,8 +285,8 @@ namespace Aaru
{ {
byte specification = (byte)((typeAndTimeZone & 0xF000) >> 12); byte specification = (byte)((typeAndTimeZone & 0xF000) >> 12);
long ticks = (long)centiseconds * 100000 + (long)hundredsOfMicroseconds * 1000 + long ticks = ((long)centiseconds * 100000) + ((long)hundredsOfMicroseconds * 1000) +
(long)microseconds * 10; ((long)microseconds * 10);
if(specification == 0) if(specification == 0)
return new DateTime(year, month, day, hour, minute, second, DateTimeKind.Utc).AddTicks(ticks); return new DateTime(year, month, day, hour, minute, second, DateTimeKind.Utc).AddTicks(ticks);
@@ -321,7 +321,7 @@ namespace Aaru
public static DateTime Os9ToDateTime(byte[] date) public static DateTime Os9ToDateTime(byte[] date)
{ {
if(date == null || if(date == null ||
date.Length != 3 && date.Length != 5) (date.Length != 3 && date.Length != 5))
return DateTime.MinValue; return DateTime.MinValue;
DateTime os9Date; DateTime os9Date;
@@ -363,12 +363,12 @@ namespace Aaru
{ {
try try
{ {
int iyear = (year >> 4) * 10 + (year & 0xF); int iyear = ((year >> 4) * 10) + (year & 0xF);
int imonth = (month >> 4) * 10 + (month & 0xF); int imonth = ((month >> 4) * 10) + (month & 0xF);
int iday = (day >> 4) * 10 + (day & 0xF); int iday = ((day >> 4) * 10) + (day & 0xF);
int iminute = (minute >> 4) * 10 + (minute & 0xF); int iminute = ((minute >> 4) * 10) + (minute & 0xF);
int ihour = (hour >> 4) * 10 + (hour & 0xF); int ihour = ((hour >> 4) * 10) + (hour & 0xF);
int isecond = (second >> 4) * 10 + (second & 0xF); int isecond = ((second >> 4) * 10) + (second & 0xF);
if(iyear >= 70) if(iyear >= 70)
iyear += 1900; iyear += 1900;

12
Marshal.cs
View File

@@ -89,7 +89,7 @@ namespace Aaru.Helpers
ptr.Free(); ptr.Free();
return(T)SwapStructureMembersEndian(str); return (T)SwapStructureMembersEndian(str);
} }
/// <summary>Marshal big-endian binary data to a structure</summary> /// <summary>Marshal big-endian binary data to a structure</summary>
@@ -121,7 +121,7 @@ namespace Aaru.Helpers
ptr.Free(); ptr.Free();
return(T)SwapStructureMembersEndianPdp(str); return (T)SwapStructureMembersEndianPdp(str);
} }
} }
@@ -175,7 +175,7 @@ namespace Aaru.Helpers
{ {
T str = SpanToStructureLittleEndian<T>(bytes); T str = SpanToStructureLittleEndian<T>(bytes);
return(T)SwapStructureMembersEndian(str); return (T)SwapStructureMembersEndian(str);
} }
/// <summary> /// <summary>
@@ -192,7 +192,7 @@ namespace Aaru.Helpers
{ {
T str = SpanToStructureLittleEndian<T>(bytes.Slice(start, length)); T str = SpanToStructureLittleEndian<T>(bytes.Slice(start, length));
return(T)SwapStructureMembersEndian(str); return (T)SwapStructureMembersEndian(str);
} }
/// <summary> /// <summary>
@@ -207,7 +207,7 @@ namespace Aaru.Helpers
{ {
object str = SpanToStructureLittleEndian<T>(bytes); object str = SpanToStructureLittleEndian<T>(bytes);
return(T)SwapStructureMembersEndianPdp(str); return (T)SwapStructureMembersEndianPdp(str);
} }
/// <summary> /// <summary>
@@ -222,7 +222,7 @@ namespace Aaru.Helpers
{ {
object str = SpanToStructureLittleEndian<T>(bytes.Slice(start, length)); object str = SpanToStructureLittleEndian<T>(bytes.Slice(start, length));
return(T)SwapStructureMembersEndianPdp(str); return (T)SwapStructureMembersEndianPdp(str);
} }
/// <summary> /// <summary>

2
StringHandlers.cs
View File

@@ -136,7 +136,7 @@ namespace Aaru
for(int i = SpacePaddedString.Length; i >= start; i--) for(int i = SpacePaddedString.Length; i >= start; i--)
{ {
if(i == start) if(i == start)
return""; return "";
if(SpacePaddedString[i - 1] == 0x20) if(SpacePaddedString[i - 1] == 0x20)
continue; continue;

4
Swapping.cs
View File

@@ -53,7 +53,7 @@ namespace Aaru
{ {
x = ((x << 8) & 0xFF00FF00) | ((x >> 8) & 0xFF00FF); x = ((x << 8) & 0xFF00FF00) | ((x >> 8) & 0xFF00FF);
return(x << 16) | (x >> 16); return (x << 16) | (x >> 16);
} }
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -61,7 +61,7 @@ namespace Aaru
{ {
x = (int)(((x << 8) & 0xFF00FF00) | (((uint)x >> 8) & 0xFF00FF)); x = (int)(((x << 8) & 0xFF00FF00) | (((uint)x >> 8) & 0xFF00FF));
return(int)(((uint)x << 16) | (((uint)x >> 16) & 0xFFFF)); return (int)(((uint)x << 16) | (((uint)x >> 16) & 0xFFFF));
} }
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]