diff --git a/trunk/ConsoleDataMigration/ConsoleBackup/Exporter.cpp b/trunk/ConsoleDataMigration/ConsoleBackup/Exporter.cpp index 81fad4e..83f4d5e 100644 --- a/trunk/ConsoleDataMigration/ConsoleBackup/Exporter.cpp +++ b/trunk/ConsoleDataMigration/ConsoleBackup/Exporter.cpp @@ -308,8 +308,7 @@ void WriteTwlData(enum common::TWL_PATH_INDEX path) NN_LOG("File Number = %d\n", fileNum); NN_LOG("File Size = %d\n", fileSize); // 進捗表示用 - common::SetTotalSize(fileSize); - common::ClearFinishedSize(); + common::InitializeTransferProgress(fileSize); void* buf = common::HeapManager::GetHeap()->Allocate(bufSize); if (buf != NULL) @@ -428,8 +427,7 @@ nn::Result WriteSaveData() NN_LOG("File Number = %d\n", fileNum); NN_LOG("File Size = %d\n", fileSize); // 進捗表示用 - common::SetTotalSize(fileSize); - common::ClearFinishedSize(); + common::InitializeTransferProgress(fileSize); ::std::mbstowcs(s_RootName, s_SysSaveRoot.c_str(), s_SysSaveRoot.size() + 1); diff --git a/trunk/ConsoleDataMigration/ConsoleRestore/Importer.cpp b/trunk/ConsoleDataMigration/ConsoleRestore/Importer.cpp index 957d1f6..fc0647d 100644 --- a/trunk/ConsoleDataMigration/ConsoleRestore/Importer.cpp +++ b/trunk/ConsoleDataMigration/ConsoleRestore/Importer.cpp @@ -590,8 +590,7 @@ void ImportSaveData() common::SdMountManager::Unmount(); // ファイルサイズ設定 - common::SetTotalSize(fileSize); - common::ClearFinishedSize(); + common::InitializeTransferProgress(fileSize); NN_LOG("File Number = %d\n", fileNum); NN_LOG("File Size = %d\n", fileSize); @@ -1129,8 +1128,7 @@ void ImportTwlData(enum common::TWL_PATH_INDEX path) common::CalculateFileNum(::std::wstring(common::SDMC_ROOT_DIRECTORY_PATH) + ::std::wstring( common::SD_TWL_ROOTNAME_TABLE[path]), fileNum, fileSize); // ファイルサイズ設定 - common::SetTotalSize(fileSize); - common::ClearFinishedSize(); + common::InitializeTransferProgress(fileSize); NN_LOG("File Number = %d\n", fileNum); NN_LOG("File Size = %d\n", fileSize); diff --git a/trunk/ConsoleDataMigration/common/FileTransfer.cpp b/trunk/ConsoleDataMigration/common/FileTransfer.cpp index cd3a218..7fad71d 100644 --- a/trunk/ConsoleDataMigration/common/FileTransfer.cpp +++ b/trunk/ConsoleDataMigration/common/FileTransfer.cpp @@ -240,13 +240,9 @@ u32 GetProgress() return s_Progress; } -void SetTotalSize(u64 size) -{ - s_TotalFileSize = size; -} - -void ClearFinishedSize() +void InitializeTransferProgress(u64 totalSize) { + s_TotalFileSize = totalSize; s_FinishedFileSize = 0; } diff --git a/trunk/ConsoleDataMigration/common/FileTransfer.h b/trunk/ConsoleDataMigration/common/FileTransfer.h index 32c80a8..cacddfb 100644 --- a/trunk/ConsoleDataMigration/common/FileTransfer.h +++ b/trunk/ConsoleDataMigration/common/FileTransfer.h @@ -26,8 +26,7 @@ namespace common nn::Result CalculateFileNum(std::wstring currentDirectory, u32& fileNum, u32& fileSize); bool CopyDirectory(const wchar_t * from_path, const wchar_t * to_path, void* buf, const size_t bufSize); u32 GetProgress(); -void SetTotalSize(u64 size); -void ClearFinishedSize(); +void InitializeTransferProgress(u64 totalSize); }