diff --git a/trunk/ConsoleDataMigration/sources/tools/ExportedDataVerifier/main.cpp b/trunk/ConsoleDataMigration/sources/tools/ExportedDataVerifier/main.cpp index f2ab0b0..616e004 100644 --- a/trunk/ConsoleDataMigration/sources/tools/ExportedDataVerifier/main.cpp +++ b/trunk/ConsoleDataMigration/sources/tools/ExportedDataVerifier/main.cpp @@ -80,22 +80,13 @@ u32 s_VerifyFail = 0; } -const char* GetCharStr(const wchar_t* path) -{ - static char filename[nn::fs::MAX_FILE_PATH_LENGTH]; - std::memset(filename, 0, sizeof(filename)); - std::wcstombs(filename, path, sizeof(filename)); - filename[sizeof(filename) - 1] = '\0'; - return filename; -} - void GenerateNandPath(wchar_t* toPath, const wchar_t* fromPath) { // 切り詰める - std::string tmp(GetCharStr(fromPath)); - std::string twlPhotoRoot(GetCharStr(common::SD_SAVEDATA_TWL_PHOTO_ROOT_NAME)); - std::string twlSoundRoot(GetCharStr(common::SD_SAVEDATA_TWL_SOUND_ROOT_NAME)); - std::string ctrRoot(GetCharStr(common::SD_SAVEDATA_ROOT_NAME)); + std::string tmp(common::GetCharStr(fromPath)); + std::string twlPhotoRoot(common::GetCharStr(common::SD_SAVEDATA_TWL_PHOTO_ROOT_NAME)); + std::string twlSoundRoot(common::GetCharStr(common::SD_SAVEDATA_TWL_SOUND_ROOT_NAME)); + std::string ctrRoot(common::GetCharStr(common::SD_SAVEDATA_ROOT_NAME)); std::string output; @@ -313,12 +304,12 @@ bool VerifyDirectory(const wchar_t * from_path, void* buf, ret_value = CalculateAndCompareCmac(&context, sdCmac); if(!ret_value) { - COMMON_LOGGER("********** Verification Failed **********\n %s\n", GetCharStr(target_from.str().c_str())); + COMMON_LOGGER("********** Verification Failed **********\n %s\n", common::GetCharStr(target_from.str().c_str())); s_VerifyFail++; } else { - COMMON_LOGGER("Success %s\n", GetCharStr(target_from.str().c_str())); + COMMON_LOGGER("Success %s\n", common::GetCharStr(target_from.str().c_str())); s_VerifySuccess++; } break; @@ -339,12 +330,12 @@ bool VerifyDirectory(const wchar_t * from_path, void* buf, ret_value = CalculateAndCompareCmac(&context, sdCmac); if(!ret_value) { - COMMON_LOGGER("********** Verification Failed **********\n %s\n", GetCharStr(target_from.str().c_str())); + COMMON_LOGGER("********** Verification Failed **********\n %s\n", common::GetCharStr(target_from.str().c_str())); s_VerifyFail++; } else { - COMMON_LOGGER("Success %s\n", GetCharStr(target_from.str().c_str())); + COMMON_LOGGER("Success %s\n", common::GetCharStr(target_from.str().c_str())); s_VerifySuccess++; } break;