Mirrors/citra-nightly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixup! string_util: Remove StringFromFormat() and related functions

Browse source
This commit is contained in:
fearlessTobi 2018-08-28 20:42:10 +02:00
parent 3284bef360
commit cb3ef488c7
5 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/core/file_sys/archive_extsavedata.cpp
View file

@ -166,15 +166,14 @@ std::string GetExtSaveDataPath(const std::string& mount_point, const Path& path)
ExtSaveDataArchivePath path_data;
std::memcpy(&path_data, vec_data.data(), sizeof(path_data));
return fmt::format("{}{:08x}/{:08x}/", mount_point.c_str(), path_data.save_high,
path_data.save_low);
return fmt::format("{}{:08X}/{:08X}/", mount_point, path_data.save_high, path_data.save_low);
}
std::string GetExtDataContainerPath(const std::string& mount_point, bool shared) {
if (shared)
return fmt::format("{}data/{}/extdata/", mount_point.c_str(), SYSTEM_ID);
return fmt::format("{}data/{}/extdata/", mount_point, SYSTEM_ID);
return fmt::format("{}Nintendo 3DS/{}/{}/extdata/", mount_point.c_str(), SYSTEM_ID, SDCARD_ID);
return fmt::format("{}Nintendo 3DS/{}/{}/extdata/", mount_point, SYSTEM_ID, SDCARD_ID);
}
Path ConstructExtDataBinaryPath(u32 media_type, u32 high, u32 low) {

6
src/core/file_sys/archive_source_sd_savedata.cpp
View file

@ -19,19 +19,19 @@ namespace FileSys {
namespace {
std::string GetSaveDataContainerPath(const std::string& sdmc_directory) {
return fmt::format("{}Nintendo 3DS/{}/{}/title/", sdmc_directory.c_str(), SYSTEM_ID, SDCARD_ID);
return fmt::format("{}Nintendo 3DS/{}/{}/title/", sdmc_directory, SYSTEM_ID, SDCARD_ID);
}
std::string GetSaveDataPath(const std::string& mount_location, u64 program_id) {
u32 high = static_cast<u32>(program_id >> 32);
u32 low = static_cast<u32>(program_id & 0xFFFFFFFF);
return fmt::format("{}{:08x}/{:08x}/data/00000001/", mount_location.c_str(), high, low);
return fmt::format("{}{:08x}/{:08x}/data/00000001/", mount_location, high, low);
}
std::string GetSaveDataMetadataPath(const std::string& mount_location, u64 program_id) {
u32 high = static_cast<u32>(program_id >> 32);
u32 low = static_cast<u32>(program_id & 0xFFFFFFFF);
return fmt::format("{}{:08x}/{:08x}/data/00000001.metadata", mount_location.c_str(), high, low);
return fmt::format("{}{:08x}/{:08x}/data/00000001.metadata", mount_location, high, low);
}
} // namespace

4
src/core/file_sys/archive_systemsavedata.cpp
View file

@ -26,11 +26,11 @@ std::string GetSystemSaveDataPath(const std::string& mount_point, const Path& pa
u32 save_high;
std::memcpy(&save_low, &vec_data[4], sizeof(u32));
std::memcpy(&save_high, &vec_data[0], sizeof(u32));
return fmt::format("{}{:08X}/{:08X}/", mount_point.c_str(), save_low, save_high);
return fmt::format("{}{:08X}/{:08X}/", mount_point, save_low, save_high);
}
std::string GetSystemSaveDataContainerPath(const std::string& mount_point) {
return fmt::format("{}data/{}/sysdata/", mount_point.c_str(), SYSTEM_ID);
return fmt::format("{}data/{}/sysdata/", mount_point, SYSTEM_ID);
}
Path ConstructSystemSaveDataBinaryPath(u32 high, u32 low) {