From 85dbb9559ad317a657dafd24da27fec4b3f5250f Mon Sep 17 00:00:00 2001 From: Alex Barney Date: Tue, 4 Dec 2018 14:23:37 -0600 Subject: Adjust naming conventions and general refactoring in HLE Project (#490) * Rename enum fields * Naming conventions * Remove unneeded ".this" * Remove unneeded semicolons * Remove unused Usings * Don't use var * Remove unneeded enum underlying types * Explicitly label class visibility * Remove unneeded @ prefixes * Remove unneeded commas * Remove unneeded if expressions * Method doesn't use unsafe code * Remove unneeded casts * Initialized objects don't need an empty constructor * Remove settings from DotSettings * Revert "Explicitly label class visibility" This reverts commit ad5eb5787cc5b27a4631cd46ef5f551c4ae95e51. * Small changes * Revert external enum renaming * Changes from feedback * Remove unneeded property setters --- Ryujinx.HLE/Loaders/Npdm/FsAccessHeader.cs | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'Ryujinx.HLE/Loaders/Npdm/FsAccessHeader.cs') diff --git a/Ryujinx.HLE/Loaders/Npdm/FsAccessHeader.cs b/Ryujinx.HLE/Loaders/Npdm/FsAccessHeader.cs index 50e82309..97fb3b14 100644 --- a/Ryujinx.HLE/Loaders/Npdm/FsAccessHeader.cs +++ b/Ryujinx.HLE/Loaders/Npdm/FsAccessHeader.cs @@ -6,29 +6,29 @@ namespace Ryujinx.HLE.Loaders.Npdm { class FsAccessHeader { - public int Version { get; private set; } - public ulong PermissionsBitmask { get; private set; } + public int Version { get; } + public ulong PermissionsBitmask { get; } - public FsAccessHeader(Stream Stream, int Offset, int Size) + public FsAccessHeader(Stream stream, int offset, int size) { - Stream.Seek(Offset, SeekOrigin.Begin); + stream.Seek(offset, SeekOrigin.Begin); - BinaryReader Reader = new BinaryReader(Stream); + BinaryReader reader = new BinaryReader(stream); - Version = Reader.ReadInt32(); - PermissionsBitmask = Reader.ReadUInt64(); + Version = reader.ReadInt32(); + PermissionsBitmask = reader.ReadUInt64(); - int DataSize = Reader.ReadInt32(); + int dataSize = reader.ReadInt32(); - if (DataSize != 0x1c) + if (dataSize != 0x1c) { throw new InvalidNpdmException("FsAccessHeader is corrupted!"); } - int ContentOwnerIdSize = Reader.ReadInt32(); - int DataAndContentOwnerIdSize = Reader.ReadInt32(); + int contentOwnerIdSize = reader.ReadInt32(); + int dataAndContentOwnerIdSize = reader.ReadInt32(); - if (DataAndContentOwnerIdSize != 0x1c) + if (dataAndContentOwnerIdSize != 0x1c) { throw new NotImplementedException("ContentOwnerId section is not implemented!"); } -- cgit v1.2.3