N-archive/citra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #5398 from lioncash/call

Browse source 
am: Remove redundant c_str() calls
This commit is contained in:
Pengfei Zhu 2020-06-07 22:57:40 +08:00 committed by GitHub
commit 1643cf5b86
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/core/hle/service/am/am.cpp
View file

@ -447,7 +447,7 @@ std::string GetTitleMetadataPath(Service::FS::MediaType media_type, u64 tid, boo
Common::SplitPath(entry.virtualName, nullptr, &filename_filename, &filename_extension); Common::SplitPath(entry.virtualName, nullptr, &filename_filename, &filename_extension);
if (filename_extension == ".tmd") { if (filename_extension == ".tmd") {
u32 id = std::stoul(filename_filename.c_str(), nullptr, 16); const u32 id = std::stoul(filename_filename, nullptr, 16);
base_id = std::min(base_id, id); base_id = std::min(base_id, id);
update_id = std::max(update_id, id); update_id = std::max(update_id, id);
} }
@ -548,7 +548,7 @@ void Module::ScanForTitles(Service::FS::MediaType media_type) {
std::string tid_string = tid_high.virtualName + tid_low.virtualName; std::string tid_string = tid_high.virtualName + tid_low.virtualName;
if (tid_string.length() == TITLE_ID_VALID_LENGTH) { if (tid_string.length() == TITLE_ID_VALID_LENGTH) {
u64 tid = std::stoull(tid_string.c_str(), nullptr, 16); const u64 tid = std::stoull(tid_string, nullptr, 16);
FileSys::NCCHContainer container(GetTitleContentPath(media_type, tid)); FileSys::NCCHContainer container(GetTitleContentPath(media_type, tid));
if (container.Load() == Loader::ResultStatus::Success) if (container.Load() == Loader::ResultStatus::Success)