mirrors/LibHac
1
0
Fork 0
mirror of https://github.com/Thealexbarney/LibHac.git synced 2024-11-14 10:49:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make sure modifiers are all in a consistent order

Browse source
This commit is contained in:
Alex Barney 2021-12-18 19:28:15 -07:00
parent e3d55f6793
commit 3c6d082ad4
6 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/LibHac/Boot/KeyBlob.cs
View file

@ -49,7 +49,7 @@ public struct EncryptedKeyBlob
return SpanHelpers.AsReadOnlyByteSpan(in value);
}
public override readonly string ToString() => ReadOnlyBytes.ToHexString();
public readonly override string ToString() => ReadOnlyBytes.ToHexString();
}
[DebuggerDisplay("{ToString()}")]
@ -89,5 +89,5 @@ public struct KeyBlob
return SpanHelpers.AsReadOnlyByteSpan(in value);
}
public override readonly string ToString() => ReadOnlyBytes.ToHexString();
}
public readonly override string ToString() => ReadOnlyBytes.ToHexString();
}

4
src/LibHac/Common/U8StringBuilder.cs
View file

@ -439,7 +439,7 @@ public ref struct U8StringBuilder
}
}
public override readonly string ToString() => StringUtils.Utf8ZToString(Buffer);
public readonly override string ToString() => StringUtils.Utf8ZToString(Buffer);
}
public static class U8StringBuilderExtensions
@ -565,4 +565,4 @@ public static class U8StringBuilderExtensions
sb.PadRightInternal(paddingCharacter, paddedLength);
return ref sb;
}
}
}

10
src/LibHac/Crypto/KeyTypes.cs
View file

@ -28,7 +28,7 @@ public struct AesKey
public static implicit operator ReadOnlySpan<byte>(in AesKey value) => value.DataRo;
public override readonly string ToString() => DataRo.ToHexString();
public readonly override string ToString() => DataRo.ToHexString();
#if DEBUG
[FieldOffset(8)] [DebuggerBrowsable(DebuggerBrowsableState.Never)] private readonly ulong _dummy1;
@ -60,7 +60,7 @@ public struct AesXtsKey
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public readonly bool IsZeros() => (DataRo64[0] | DataRo64[1] | DataRo64[2] | DataRo64[3]) == 0;
public override readonly string ToString() => DataRo.ToHexString();
public readonly override string ToString() => DataRo.ToHexString();
}
[DebuggerDisplay("{ToString()}")]
@ -83,7 +83,7 @@ public struct AesIv
public static implicit operator Span<byte>(in AesIv value) => Unsafe.AsRef(in value).Data;
public static implicit operator ReadOnlySpan<byte>(in AesIv value) => value.DataRo;
public override readonly string ToString() => DataRo.ToHexString();
public readonly override string ToString() => DataRo.ToHexString();
#if DEBUG
[FieldOffset(8)] [DebuggerBrowsable(DebuggerBrowsableState.Never)] private readonly ulong _dummy1;
@ -110,7 +110,7 @@ public struct AesCmac
public static implicit operator Span<byte>(in AesCmac value) => Unsafe.AsRef(in value).Data;
public static implicit operator ReadOnlySpan<byte>(in AesCmac value) => value.DataRo;
public override readonly string ToString() => DataRo.ToHexString();
public readonly override string ToString() => DataRo.ToHexString();
#if DEBUG
[FieldOffset(8)] [DebuggerBrowsable(DebuggerBrowsableState.Never)] private readonly ulong _dummy1;
@ -162,4 +162,4 @@ public struct Data3
public Span<byte> Data => SpanHelpers.CreateSpan(ref _byte, 3);
public readonly ReadOnlySpan<byte> DataRo => SpanHelpers.CreateReadOnlySpan(in _byte, 3);
}
}

4
src/LibHac/Fs/Common/Path.cs
View file

@ -1085,7 +1085,7 @@ public ref struct Path
}
}
public override readonly string ToString() => StringUtils.Utf8ZToString(_string);
public readonly override string ToString() => StringUtils.Utf8ZToString(_string);
public override bool Equals(object obj) => throw new NotSupportedException();
public override int GetHashCode() => throw new NotImplementedException();
@ -1230,4 +1230,4 @@ public static class PathFunctions
return SetUpFixedPath(ref path, pathBuffer);
}
}
}

6
src/LibHac/Fs/SaveDataStructs.cs
View file

@ -68,7 +68,7 @@ public struct SaveDataAttribute : IEquatable<SaveDataAttribute>, IComparable<Sav
return Result.Success;
}
public override readonly bool Equals(object obj)
public readonly override bool Equals(object obj)
{
return obj is SaveDataAttribute attribute && Equals(attribute);
}
@ -86,7 +86,7 @@ public struct SaveDataAttribute : IEquatable<SaveDataAttribute>, IComparable<Sav
public static bool operator ==(SaveDataAttribute left, SaveDataAttribute right) => left.Equals(right);
public static bool operator !=(SaveDataAttribute left, SaveDataAttribute right) => !(left == right);
public override readonly int GetHashCode()
public readonly override int GetHashCode()
{
// ReSharper disable NonReadonlyMemberInGetHashCode
return HashCode.Combine(ProgramId, Type, UserId, StaticSaveDataId, Rank, Index);
@ -339,4 +339,4 @@ internal static class SaveDataTypesValidity
{
return (uint)metaType <= (uint)SaveDataMetaType.ExtensionContext;
}
}
}

4
src/LibHac/Lr/Path.cs
View file

@ -31,5 +31,5 @@ public struct Path
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static implicit operator U8Span(in Path value) => new U8Span(SpanHelpers.AsReadOnlyByteSpan(in value));
public override readonly string ToString() => StringUtils.Utf8ZToString(Str);
}
public readonly override string ToString() => StringUtils.Utf8ZToString(Str);
}