diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2014-06-19 01:59:02 +0200 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2014-06-19 01:59:02 +0200 |
| commit | 591a27e32894f9454ebbdae040f61e60fa1ebf87 (patch) | |
| tree | a8a50407af01bd5da5b9ba122e02a756ac73119d /Source/Core/DiscIO/BannerLoaderWii.cpp | |
| parent | dccd9ead7dd23bf3b463a8e4043bdc63de6a7a9f (diff) | |
| parent | ce54c1e571a7f79c173dd8f949003255ba95670a (diff) | |
Merge pull request #456 from lioncash/adios-sprintf
Kill off replaceable usages of s[n]printf.
Diffstat (limited to 'Source/Core/DiscIO/BannerLoaderWii.cpp')
| -rw-r--r-- | Source/Core/DiscIO/BannerLoaderWii.cpp | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/Source/Core/DiscIO/BannerLoaderWii.cpp b/Source/Core/DiscIO/BannerLoaderWii.cpp index 7b940fda46..338169f447 100644 --- a/Source/Core/DiscIO/BannerLoaderWii.cpp +++ b/Source/Core/DiscIO/BannerLoaderWii.cpp @@ -24,15 +24,12 @@ CBannerLoaderWii::CBannerLoaderWii(DiscIO::IVolume *pVolume) : m_pBannerFile(nullptr) , m_IsValid(false) { - char Filename[260]; u64 TitleID; - pVolume->GetTitleID((u8*)&TitleID); - TitleID = Common::swap64(TitleID); - sprintf(Filename, "%stitle/%08x/%08x/data/banner.bin", - File::GetUserPath(D_WIIUSER_IDX).c_str(), (u32)(TitleID>>32), (u32)TitleID); + std::string Filename = StringFromFormat("%stitle/%08x/%08x/data/banner.bin", + File::GetUserPath(D_WIIUSER_IDX).c_str(), (u32)(TitleID>>32), (u32)TitleID); if (!File::Exists(Filename)) { @@ -40,26 +37,26 @@ CBannerLoaderWii::CBannerLoaderWii(DiscIO::IVolume *pVolume) // from the savefiles is very different from the banner.bin // inside opening.bnr #if 0 - char bnrFilename[260], titleFolder[260]; - // Creating title folder - sprintf(titleFolder, "%stitle/%08x/%08x/data/", + std::string titleFolder = StringFromFormat("%stitle/%08x/%08x/data/", 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", + std::string bnrFilename = StringFromFormat("%stitle/%08x/%08x/data/opening.bnr", File::GetUserPath(D_WIIUSER_IDX).c_str(), (u32)(TitleID>>32), (u32)TitleID); - if (!_rFileSystem.ExportFile("opening.bnr", bnrFilename)) { + if (!_rFileSystem.ExportFile("opening.bnr", bnrFilename)) + { m_IsValid = false; return; } CARCFile bnrArc (bnrFilename, 0x600); - if (!bnrArc.ExportFile("meta/banner.bin", Filename)) { + if (!bnrArc.ExportFile("meta/banner.bin", Filename)) + { m_IsValid = false; return; } |