mirrors/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename rc -> result

Browse source
This commit is contained in:
Alex Barney 2019-10-16 11:49:22 -05:00
commit 7a3623c0bf
11 changed files with 58 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Ryujinx.HLE/HOS/Horizon.cs
View file

@ -305,8 +305,8 @@ namespace Ryujinx.HLE.HOS
foreach (DirectoryEntryEx ticketEntry in securePartition.EnumerateEntries("/", "*.tik")) foreach (DirectoryEntryEx ticketEntry in securePartition.EnumerateEntries("/", "*.tik"))
{ {
Result rc = securePartition.OpenFile(out IFile ticketFile, ticketEntry.FullPath, OpenMode.Read); Result result = securePartition.OpenFile(out IFile ticketFile, ticketEntry.FullPath, OpenMode.Read);
if (rc.IsFailure()) continue; if (result.IsFailure()) continue;
Ticket ticket = new Ticket(ticketFile.AsStream()); Ticket ticket = new Ticket(ticketFile.AsStream());
@ -315,8 +315,8 @@ namespace Ryujinx.HLE.HOS
foreach (DirectoryEntryEx fileEntry in securePartition.EnumerateEntries("/", "*.nca")) foreach (DirectoryEntryEx fileEntry in securePartition.EnumerateEntries("/", "*.nca"))
{ {
Result rc = securePartition.OpenFile(out IFile ncaFile, fileEntry.FullPath, OpenMode.Read); Result result = securePartition.OpenFile(out IFile ncaFile, fileEntry.FullPath, OpenMode.Read);
if (rc.IsFailure()) continue; if (result.IsFailure()) continue;
Nca nca = new Nca(KeySet, ncaFile.AsStorage()); Nca nca = new Nca(KeySet, ncaFile.AsStorage());
@ -356,8 +356,8 @@ namespace Ryujinx.HLE.HOS
{ {
IFileSystem controlFs = controlNca.OpenFileSystem(NcaSectionType.Data, FsIntegrityCheckLevel); IFileSystem controlFs = controlNca.OpenFileSystem(NcaSectionType.Data, FsIntegrityCheckLevel);
Result rc = controlFs.OpenFile(out IFile controlFile, "/control.nacp", OpenMode.Read); Result result = controlFs.OpenFile(out IFile controlFile, "/control.nacp", OpenMode.Read);
if (rc.IsFailure()) return; if (result.IsFailure()) return;
ControlData = new Nacp(controlFile.AsStream()); ControlData = new Nacp(controlFile.AsStream());
@ -381,8 +381,8 @@ namespace Ryujinx.HLE.HOS
foreach (DirectoryEntryEx ticketEntry in nsp.EnumerateEntries("/", "*.tik")) foreach (DirectoryEntryEx ticketEntry in nsp.EnumerateEntries("/", "*.tik"))
{ {
Result rc = nsp.OpenFile(out IFile ticketFile, ticketEntry.FullPath, OpenMode.Read); Result result = nsp.OpenFile(out IFile ticketFile, ticketEntry.FullPath, OpenMode.Read);
if (rc.IsFailure()) continue; if (result.IsFailure()) continue;
Ticket ticket = new Ticket(ticketFile.AsStream()); Ticket ticket = new Ticket(ticketFile.AsStream());
@ -515,9 +515,9 @@ namespace Ryujinx.HLE.HOS
private void LoadExeFs(IFileSystem codeFs, out Npdm metaData) private void LoadExeFs(IFileSystem codeFs, out Npdm metaData)
{ {
Result rc = codeFs.OpenFile(out IFile npdmFile, "/main.npdm", OpenMode.Read); Result result = codeFs.OpenFile(out IFile npdmFile, "/main.npdm", OpenMode.Read);
if (rc == ResultFs.PathNotFound) if (result == ResultFs.PathNotFound)
{ {
Logger.PrintWarning(LogClass.Loader, "NPDM file not found, using default values!"); Logger.PrintWarning(LogClass.Loader, "NPDM file not found, using default values!");

12
Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/FileSystemProxyHelper.cs
View file

@ -28,8 +28,8 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy
{ {
LocalFileSystem fileSystem = new LocalFileSystem(savePath); LocalFileSystem fileSystem = new LocalFileSystem(savePath);
Result rc = DirectorySaveDataFileSystem.CreateNew(out DirectorySaveDataFileSystem dirFileSystem, fileSystem); Result result = DirectorySaveDataFileSystem.CreateNew(out DirectorySaveDataFileSystem dirFileSystem, fileSystem);
if (rc.IsFailure()) return (ResultCode)rc.Value; if (result.IsFailure()) return (ResultCode)result.Value;
LibHac.Fs.IFileSystem saveFileSystem = dirFileSystem; LibHac.Fs.IFileSystem saveFileSystem = dirFileSystem;
@ -120,8 +120,8 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy
string filename = fullPath.Replace(archivePath.FullName, string.Empty).TrimStart('\\'); string filename = fullPath.Replace(archivePath.FullName, string.Empty).TrimStart('\\');
Result rc = nsp.OpenFile(out LibHac.Fs.IFile ncaFile, filename, OpenMode.Read); Result result = nsp.OpenFile(out LibHac.Fs.IFile ncaFile, filename, OpenMode.Read);
if (rc.IsFailure()) return (ResultCode)rc.Value; if (result.IsFailure()) return (ResultCode)result.Value;
return OpenNcaFs(context, fullPath, ncaFile.AsStorage(), out openedFileSystem); return OpenNcaFs(context, fullPath, ncaFile.AsStorage(), out openedFileSystem);
} }
@ -138,8 +138,8 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy
{ {
foreach (DirectoryEntryEx ticketEntry in nsp.EnumerateEntries("/", "*.tik")) foreach (DirectoryEntryEx ticketEntry in nsp.EnumerateEntries("/", "*.tik"))
{ {
Result rc = nsp.OpenFile(out LibHac.Fs.IFile ticketFile, ticketEntry.FullPath, OpenMode.Read); Result result = nsp.OpenFile(out LibHac.Fs.IFile ticketFile, ticketEntry.FullPath, OpenMode.Read);
if (rc.IsFailure()) continue; if (result.IsFailure()) continue;
Ticket ticket = new Ticket(ticketFile.AsStream()); Ticket ticket = new Ticket(ticketFile.AsStream());

8
Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/IDirectory.cs
View file

@ -24,23 +24,23 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy
byte[] entriesBytes = new byte[bufferLen]; byte[] entriesBytes = new byte[bufferLen];
Span<DirectoryEntry> entries = MemoryMarshal.Cast<byte, DirectoryEntry>(entriesBytes); Span<DirectoryEntry> entries = MemoryMarshal.Cast<byte, DirectoryEntry>(entriesBytes);
Result rc = _baseDirectory.Read(out long entriesRead, entries); Result result = _baseDirectory.Read(out long entriesRead, entries);
context.Memory.WriteBytes(bufferPosition, entriesBytes); context.Memory.WriteBytes(bufferPosition, entriesBytes);
context.ResponseData.Write(entriesRead); context.ResponseData.Write(entriesRead);
return (ResultCode)rc.Value; return (ResultCode)result.Value;
} }
[Command(1)] [Command(1)]
// GetEntryCount() -> u64 // GetEntryCount() -> u64
public ResultCode GetEntryCount(ServiceCtx context) public ResultCode GetEntryCount(ServiceCtx context)
{ {
Result rc = _baseDirectory.GetEntryCount(out long entryCount); Result result = _baseDirectory.GetEntryCount(out long entryCount);
context.ResponseData.Write(entryCount); context.ResponseData.Write(entryCount);
return (ResultCode)rc.Value; return (ResultCode)result.Value;
} }
} }
} }

8
Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/IFile.cs
View file

@ -27,13 +27,13 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy
byte[] data = new byte[size]; byte[] data = new byte[size];
Result rc = _baseFile.Read(out long bytesRead, offset, data, readOption); Result result = _baseFile.Read(out long bytesRead, offset, data, readOption);
context.Memory.WriteBytes(position, data); context.Memory.WriteBytes(position, data);
context.ResponseData.Write(bytesRead); context.ResponseData.Write(bytesRead);
return (ResultCode)rc.Value; return (ResultCode)result.Value;
} }
[Command(1)] [Command(1)]
@ -73,11 +73,11 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy
// GetSize() -> u64 fileSize // GetSize() -> u64 fileSize
public ResultCode GetSize(ServiceCtx context) public ResultCode GetSize(ServiceCtx context)
{ {
Result rc = _baseFile.GetSize(out long size); Result result = _baseFile.GetSize(out long size);
context.ResponseData.Write(size); context.ResponseData.Write(size);
return (ResultCode)rc.Value; return (ResultCode)result.Value;
} }
public void Dispose() public void Dispose()

24
Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/IFileSystem.cs
View file

@ -90,11 +90,11 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy
{ {
string name = ReadUtf8String(context); string name = ReadUtf8String(context);
Result rc = _fileSystem.GetEntryType(out DirectoryEntryType entryType, name); Result result = _fileSystem.GetEntryType(out DirectoryEntryType entryType, name);
context.ResponseData.Write((int)entryType); context.ResponseData.Write((int)entryType);
return (ResultCode)rc.Value; return (ResultCode)result.Value;
} }
[Command(8)] [Command(8)]
@ -105,8 +105,8 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy
string name = ReadUtf8String(context); string name = ReadUtf8String(context);
Result rc = _fileSystem.OpenFile(out LibHac.Fs.IFile file, name, mode); Result result = _fileSystem.OpenFile(out LibHac.Fs.IFile file, name, mode);
if (rc.IsFailure()) return (ResultCode)rc.Value; if (result.IsFailure()) return (ResultCode)result.Value;
IFile fileInterface = new IFile(file); IFile fileInterface = new IFile(file);
@ -123,8 +123,8 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy
string name = ReadUtf8String(context); string name = ReadUtf8String(context);
Result rc = _fileSystem.OpenDirectory(out LibHac.Fs.IDirectory dir, name, mode); Result result = _fileSystem.OpenDirectory(out LibHac.Fs.IDirectory dir, name, mode);
if (rc.IsFailure()) return (ResultCode)rc.Value; if (result.IsFailure()) return (ResultCode)result.Value;
IDirectory dirInterface = new IDirectory(dir); IDirectory dirInterface = new IDirectory(dir);
@ -146,11 +146,11 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy
{ {
string name = ReadUtf8String(context); string name = ReadUtf8String(context);
Result rc = _fileSystem.GetFreeSpaceSize(out long size, name); Result result = _fileSystem.GetFreeSpaceSize(out long size, name);
context.ResponseData.Write(size); context.ResponseData.Write(size);
return (ResultCode)rc.Value; return (ResultCode)result.Value;
} }
[Command(12)] [Command(12)]
@ -159,11 +159,11 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy
{ {
string name = ReadUtf8String(context); string name = ReadUtf8String(context);
Result rc = _fileSystem.GetTotalSpaceSize(out long size, name); Result result = _fileSystem.GetTotalSpaceSize(out long size, name);
context.ResponseData.Write(size); context.ResponseData.Write(size);
return (ResultCode)rc.Value; return (ResultCode)result.Value;
} }
[Command(13)] [Command(13)]
@ -181,8 +181,8 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy
{ {
string name = ReadUtf8String(context); string name = ReadUtf8String(context);
Result rc = _fileSystem.GetFileTimeStampRaw(out FileTimeStampRaw timestamp, name); Result result = _fileSystem.GetFileTimeStampRaw(out FileTimeStampRaw timestamp, name);
if (rc.IsFailure()) return (ResultCode)rc.Value; if (result.IsFailure()) return (ResultCode)result.Value;
context.ResponseData.Write(timestamp.Created); context.ResponseData.Write(timestamp.Created);
context.ResponseData.Write(timestamp.Modified); context.ResponseData.Write(timestamp.Modified);

8
Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/IStorage.cs
View file

@ -31,11 +31,11 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy
byte[] data = new byte[size]; byte[] data = new byte[size];
Result rc = _baseStorage.Read(offset, data); Result result = _baseStorage.Read(offset, data);
context.Memory.WriteBytes(buffDesc.Position, data); context.Memory.WriteBytes(buffDesc.Position, data);
return (ResultCode)rc.Value; return (ResultCode)result.Value;
} }
return ResultCode.Success; return ResultCode.Success;
@ -45,11 +45,11 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy
// GetSize() -> u64 size // GetSize() -> u64 size
public ResultCode GetSize(ServiceCtx context) public ResultCode GetSize(ServiceCtx context)
{ {
Result rc = _baseStorage.GetSize(out long size); Result result = _baseStorage.GetSize(out long size);
context.ResponseData.Write(size); context.ResponseData.Write(size);
return (ResultCode)rc.Value; return (ResultCode)result.Value;
} }
} }
} }

8
Ryujinx.HLE/HOS/Services/Fs/IDeviceOperator.cs
View file

@ -16,22 +16,22 @@ namespace Ryujinx.HLE.HOS.Services.Fs
// IsGameCardInserted() -> b8 is_inserted // IsGameCardInserted() -> b8 is_inserted
public ResultCode IsGameCardInserted(ServiceCtx context) public ResultCode IsGameCardInserted(ServiceCtx context)
{ {
Result rc = _baseOperator.IsGameCardInserted(out bool isInserted); Result result = _baseOperator.IsGameCardInserted(out bool isInserted);
context.ResponseData.Write(isInserted); context.ResponseData.Write(isInserted);
return (ResultCode)rc.Value; return (ResultCode)result.Value;
} }
[Command(202)] [Command(202)]
// GetGameCardHandle() -> u32 gamecard_handle // GetGameCardHandle() -> u32 gamecard_handle
public ResultCode GetGameCardHandle(ServiceCtx context) public ResultCode GetGameCardHandle(ServiceCtx context)
{ {
Result rc = _baseOperator.GetGameCardHandle(out GameCardHandle handle); Result result = _baseOperator.GetGameCardHandle(out GameCardHandle handle);
context.ResponseData.Write(handle.Value); context.ResponseData.Write(handle.Value);
return (ResultCode)rc.Value; return (ResultCode)result.Value;
} }
} }
} }

8
Ryujinx.HLE/HOS/Services/Fs/IFileSystemProxy.cs
View file

@ -139,8 +139,8 @@ namespace Ryujinx.HLE.HOS.Services.Fs
GameCardHandle handle = new GameCardHandle(context.RequestData.ReadInt32()); GameCardHandle handle = new GameCardHandle(context.RequestData.ReadInt32());
GameCardPartitionRaw partitionId = (GameCardPartitionRaw) context.RequestData.ReadInt32(); GameCardPartitionRaw partitionId = (GameCardPartitionRaw) context.RequestData.ReadInt32();
Result rc = _baseFileSystemProxy.OpenGameCardStorage(out LibHac.Fs.IStorage storage, handle, partitionId); Result result = _baseFileSystemProxy.OpenGameCardStorage(out LibHac.Fs.IStorage storage, handle, partitionId);
if (rc.IsFailure()) return (ResultCode)rc.Value; if (result.IsFailure()) return (ResultCode)result.Value;
MakeObject(context, new FileSystemProxy.IStorage(storage)); MakeObject(context, new FileSystemProxy.IStorage(storage));
@ -272,8 +272,8 @@ namespace Ryujinx.HLE.HOS.Services.Fs
// OpenDataStorageByCurrentProcess() -> object<nn::fssrv::sf::IStorage> dataStorage // OpenDataStorageByCurrentProcess() -> object<nn::fssrv::sf::IStorage> dataStorage
public ResultCode OpenDeviceOperator(ServiceCtx context) public ResultCode OpenDeviceOperator(ServiceCtx context)
{ {
Result rc = _baseFileSystemProxy.OpenDeviceOperator(out LibHac.FsService.IDeviceOperator deviceOperator); Result result = _baseFileSystemProxy.OpenDeviceOperator(out LibHac.FsService.IDeviceOperator deviceOperator);
if (rc.IsFailure()) return (ResultCode)rc.Value; if (result.IsFailure()) return (ResultCode)result.Value;
MakeObject(context, new IDeviceOperator(deviceOperator)); MakeObject(context, new IDeviceOperator(deviceOperator));

12
Ryujinx.HLE/HOS/Services/Settings/ISystemSettingsServer.cs
View file

@ -187,16 +187,16 @@ namespace Ryujinx.HLE.HOS.Services.Settings
IFileSystem firmwareRomFs = firmwareContent.OpenFileSystem(NcaSectionType.Data, device.System.FsIntegrityCheckLevel); IFileSystem firmwareRomFs = firmwareContent.OpenFileSystem(NcaSectionType.Data, device.System.FsIntegrityCheckLevel);
Result rc = firmwareRomFs.OpenFile(out IFile firmwareFile, "/file", OpenMode.Read); Result result = firmwareRomFs.OpenFile(out IFile firmwareFile, "/file", OpenMode.Read);
if (rc.IsFailure()) return null; if (result.IsFailure()) return null;
rc = firmwareFile.GetSize(out long fileSize); result = firmwareFile.GetSize(out long fileSize);
if (rc.IsFailure()) return null; if (result.IsFailure()) return null;
byte[] data = new byte[fileSize]; byte[] data = new byte[fileSize];
rc = firmwareFile.Read(out _, 0, data); result = firmwareFile.Read(out _, 0, data);
if (rc.IsFailure()) return null; if (result.IsFailure()) return null;
return data; return data;
} }

4
Ryujinx.HLE/HOS/Services/Time/TimeZone/TimeZoneContentManager.cs
View file

@ -164,11 +164,11 @@ namespace Ryujinx.HLE.HOS.Services.Time.TimeZone
Nca nca = new Nca(_device.System.KeySet, ncaFile); Nca nca = new Nca(_device.System.KeySet, ncaFile);
IFileSystem romfs = nca.OpenFileSystem(NcaSectionType.Data, _device.System.FsIntegrityCheckLevel); IFileSystem romfs = nca.OpenFileSystem(NcaSectionType.Data, _device.System.FsIntegrityCheckLevel);
Result rc = romfs.OpenFile(out IFile timeZoneBinaryFile, $"/zoneinfo/{locationName}", OpenMode.Read); Result result = romfs.OpenFile(out IFile timeZoneBinaryFile, $"/zoneinfo/{locationName}", OpenMode.Read);
timeZoneBinaryStream = timeZoneBinaryFile.AsStream(); timeZoneBinaryStream = timeZoneBinaryFile.AsStream();
return (ResultCode)rc.Value; return (ResultCode)result.Value;
} }
internal ResultCode LoadTimeZoneRule(out TimeZoneRule outRules, string locationName) internal ResultCode LoadTimeZoneRule(out TimeZoneRule outRules, string locationName)

4
Ryujinx/Ui/ApplicationLibrary.cs
View file

@ -350,8 +350,8 @@ namespace Ryujinx.UI
// Add keys to keyset if needed // Add keys to keyset if needed
foreach (DirectoryEntryEx ticketEntry in Pfs.EnumerateEntries("/", "*.tik")) foreach (DirectoryEntryEx ticketEntry in Pfs.EnumerateEntries("/", "*.tik"))
{ {
Result rc = Pfs.OpenFile(out IFile ticketFile, ticketEntry.FullPath, OpenMode.Read); Result result = Pfs.OpenFile(out IFile ticketFile, ticketEntry.FullPath, OpenMode.Read);
if (rc.IsFailure()) continue; if (result.IsFailure()) continue;
Ticket ticket = new Ticket(ticketFile.AsStream()); Ticket ticket = new Ticket(ticketFile.AsStream());