From ba54fac9eb74be6f73e20e2de953cf6f355be57f Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Mon, 28 Feb 2011 20:40:15 +0000 Subject: Convert GetUserPath to return a std::string instead of a const char *. This simplifies its usage in most cases. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7265 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/DiscIO/Src/BannerLoaderWii.cpp | 6 +++--- Source/Core/DiscIO/Src/NANDContentLoader.cpp | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'Source/Core/DiscIO') diff --git a/Source/Core/DiscIO/Src/BannerLoaderWii.cpp b/Source/Core/DiscIO/Src/BannerLoaderWii.cpp index 5464c68df8..a43675ec87 100644 --- a/Source/Core/DiscIO/Src/BannerLoaderWii.cpp +++ b/Source/Core/DiscIO/Src/BannerLoaderWii.cpp @@ -39,7 +39,7 @@ CBannerLoaderWii::CBannerLoaderWii(DiscIO::IVolume *pVolume) TitleID = Common::swap64(TitleID); sprintf(Filename, "%stitle/%08x/%08x/data/banner.bin", - File::GetUserPath(D_WIIUSER_IDX), (u32)(TitleID>>32), (u32)TitleID); + File::GetUserPath(D_WIIUSER_IDX).c_str(), (u32)(TitleID>>32), (u32)TitleID); if (!File::Exists(Filename)) { @@ -51,13 +51,13 @@ CBannerLoaderWii::CBannerLoaderWii(DiscIO::IVolume *pVolume) // Creating title folder sprintf(titleFolder, "%stitle/%08x/%08x/data/", - File::GetUserPath(D_WIIUSER_IDX), (u32)(TitleID>>32), (u32)TitleID); + File::GetUserPath(D_WIIUSER_IDX).c_str(), (u32)(TitleID>>32), (u32)TitleID); if(!File::Exists(titleFolder)) File::CreateFullPath(titleFolder); // Extracting banner.bin from opening.bnr sprintf(bnrFilename, "%stitle/%08x/%08x/data/opening.bnr", - File::GetUserPath(D_WIIUSER_IDX), (u32)(TitleID>>32), (u32)TitleID); + File::GetUserPath(D_WIIUSER_IDX).c_str(), (u32)(TitleID>>32), (u32)TitleID); if(!_rFileSystem.ExportFile("opening.bnr", bnrFilename)) { m_IsValid = false; diff --git a/Source/Core/DiscIO/Src/NANDContentLoader.cpp b/Source/Core/DiscIO/Src/NANDContentLoader.cpp index fef659428e..eb23059c88 100644 --- a/Source/Core/DiscIO/Src/NANDContentLoader.cpp +++ b/Source/Core/DiscIO/Src/NANDContentLoader.cpp @@ -34,7 +34,7 @@ cUIDsys cUIDsys::m_Instance; CSharedContent::CSharedContent() { lastID = 0; - sprintf(contentMap, "%sshared1/content.map", File::GetUserPath(D_WIIUSER_IDX)); + sprintf(contentMap, "%sshared1/content.map", File::GetUserPath(D_WIIUSER_IDX).c_str()); if (File::Exists(contentMap)) { @@ -62,7 +62,7 @@ std::string CSharedContent::GetFilenameFromSHA1(u8* _pHash) if (memcmp(_pHash, m_Elements[i].SHA1Hash, 20) == 0) { char szFilename[1024]; - sprintf(szFilename, "%sshared1/%c%c%c%c%c%c%c%c.app", File::GetUserPath(D_WIIUSER_IDX), + sprintf(szFilename, "%sshared1/%c%c%c%c%c%c%c%c.app", File::GetUserPath(D_WIIUSER_IDX).c_str(), m_Elements[i].FileName[0], m_Elements[i].FileName[1], m_Elements[i].FileName[2], m_Elements[i].FileName[3], m_Elements[i].FileName[4], m_Elements[i].FileName[5], m_Elements[i].FileName[6], m_Elements[i].FileName[7]); return szFilename; @@ -90,7 +90,7 @@ std::string CSharedContent::AddSharedContent(u8* _pHash) fwrite(&Element, sizeof(SElement), 1, pFile); fclose(pFile); } - sprintf(tempFilename, "%sshared1/%s.app", File::GetUserPath(D_WIIUSER_IDX), c_ID); + sprintf(tempFilename, "%sshared1/%s.app", File::GetUserPath(D_WIIUSER_IDX).c_str(), c_ID); szFilename = tempFilename; lastID++; } @@ -384,7 +384,7 @@ const INANDContentLoader& CNANDContentManager::GetNANDLoader(u64 _titleId) cUIDsys::cUIDsys() { - sprintf(uidSys, "%ssys/uid.sys", File::GetUserPath(D_WIIUSER_IDX)); + sprintf(uidSys, "%ssys/uid.sys", File::GetUserPath(D_WIIUSER_IDX).c_str()); lastUID = 0x00001000; if (File::Exists(uidSys)) { -- cgit v1.2.3