Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix some minor virtual disc warnings.

Browse source
This commit is contained in:
Unknown W. Brackets 2013-07-26 22:46:03 -07:00
parent abec782420
commit b5e46b46cd
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Core/FileSystems/DirectoryFileSystem.cpp
View file

@ -803,10 +803,10 @@ std::string VirtualDiscFileSystem::GetLocalPath(std::string localpath) {
int VirtualDiscFileSystem::getFileListIndex(std::string& fileName) int VirtualDiscFileSystem::getFileListIndex(std::string& fileName)
{ {
for (int i = 0; i < fileList.size(); i++) for (size_t i = 0; i < fileList.size(); i++)
{ {
if (fileList[i].fileName == fileName) if (fileList[i].fileName == fileName)
return i; return (int)i;
} }
// unknown file - add it // unknown file - add it
@ -841,7 +841,7 @@ int VirtualDiscFileSystem::getFileListIndex(std::string& fileName)
int VirtualDiscFileSystem::getFileListIndex(u32 accessBlock, u32 accessSize) int VirtualDiscFileSystem::getFileListIndex(u32 accessBlock, u32 accessSize)
{ {
for (int i = 0; i < fileList.size(); i++) for (size_t i = 0; i < fileList.size(); i++)
{ {
if (fileList[i].firstBlock <= accessBlock) if (fileList[i].firstBlock <= accessBlock)
{ {
@ -849,7 +849,7 @@ int VirtualDiscFileSystem::getFileListIndex(u32 accessBlock, u32 accessSize)
u32 endOffset = sectorOffset+accessSize; u32 endOffset = sectorOffset+accessSize;
if (endOffset <= fileList[i].totalSize) if (endOffset <= fileList[i].totalSize)
{ {
return i; return (int)i;
} }
} }
} }
@ -883,12 +883,13 @@ u32 VirtualDiscFileSystem::OpenFile(std::string filename, FileAccess access, con
entry.type = VFILETYPE_LBN; entry.type = VFILETYPE_LBN;
entry.size = readSize; entry.size = readSize;
entry.fileIndex = getFileListIndex(sectorStart,readSize); int fileIndex = getFileListIndex(sectorStart,readSize);
if (entry.fileIndex == -1) if (fileIndex == -1)
{ {
ERROR_LOG(FILESYS, "VirtualDiscFileSystem: sce_lbn used without calling fileinfo."); ERROR_LOG(FILESYS, "VirtualDiscFileSystem: sce_lbn used without calling fileinfo.");
return 0; return 0;
} }
entry.fileIndex = (u32)fileIndex;
entry.startOffset = (sectorStart-fileList[entry.fileIndex].firstBlock)*2048; entry.startOffset = (sectorStart-fileList[entry.fileIndex].firstBlock)*2048;
@ -969,6 +970,7 @@ size_t VirtualDiscFileSystem::SeekFile(u32 handle, s32 position, FileMove type)
return iter->second.curOffset; return iter->second.curOffset;
} }
} }
return 0;
} else { } else {
//This shouldn't happen... //This shouldn't happen...
ERROR_LOG(HLE,"VirtualDiscFileSystem: Cannot seek in file that hasn't been opened: %08x", handle); ERROR_LOG(HLE,"VirtualDiscFileSystem: Cannot seek in file that hasn't been opened: %08x", handle);