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

Merge pull request #4648 from lioncash/iofile

Browse Source 
IOFile: Get rid of IOFile's ReleaseHandle function
This commit is contained in:
Matthew Parlane
2017-01-13 08:15:23 +13:00
committed by GitHub
parent 0b6e5765dd 6f08ef9a25
commit 119dfbb436
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);

8
Source/Core/Core/HW/GCMemcard.h
View File

@ -15,6 +15,11 @@
#include "Core/HW/EXI_DeviceIPL.h"
#include "Core/HW/Sram.h"
namespace File
{
class IOFile;
}
#define BE64(x) (Common::swap64(x))
#define BE32(x) (Common::swap32(x))
#define BE16(x) (Common::swap16(x))
@ -304,7 +309,8 @@ private:
std::vector<GCMBlock> mc_data_blocks;
u32 ImportGciInternal(FILE* gcih, const std::string& inputFile, const std::string& outputFile);
u32 ImportGciInternal(File::IOFile&& gci, const std::string& inputFile,
const std::string& outputFile);
void InitDirBatPointers();
public: