piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 00:59:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

IOFile: Get rid of IOFile's ReleaseHandle function

Browse Source 
Transfer of handles should be done via std::move.
This commit is contained in:
Lioncash
2017-01-11 18:00:22 -05:00
parent ed6e346664
commit 6f08ef9a25
6 changed files with 27 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/Core/HW/GCMemcard.cpp
View File

@ -827,15 +827,12 @@ u32 GCMemcard::ImportGci(const std::string& inputFile, const std::string& output
if (!gci)
return OPENFAIL;
u32 result = ImportGciInternal(gci.ReleaseHandle(), inputFile, outputFile);
return result;
return ImportGciInternal(std::move(gci), inputFile, outputFile);
}
u32 GCMemcard::ImportGciInternal(FILE* gcih, const std::string& inputFile,
u32 GCMemcard::ImportGciInternal(File::IOFile&& gci, const std::string& inputFile,
const std::string& outputFile)
{
File::IOFile gci(gcih);
unsigned int offset;
std::string fileType;
SplitPath(inputFile, nullptr, nullptr, &fileType);