From eaa385346117ca17f08a8c8bda7d3e7f92d5b68c Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Thu, 10 Feb 2011 02:31:24 +0000
Subject: [PATCH] =?UTF-8?q?=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E8=BB=A2?=
 =?UTF-8?q?=E9=80=81=E9=87=8F=E8=A1=A8=E7=A4=BA=E3=81=AE=E5=88=9D=E6=9C=9F?=
 =?UTF-8?q?=E5=8C=96=E3=82=92=E3=81=BE=E3=81=A8=E3=82=81=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_Repair@45 385bec56-5757-e545-9c3a-d8741f4650f1
---
 trunk/ConsoleDataMigration/ConsoleBackup/Exporter.cpp  | 6 ++----
 trunk/ConsoleDataMigration/ConsoleRestore/Importer.cpp | 6 ++----
 trunk/ConsoleDataMigration/common/FileTransfer.cpp     | 8 ++------
 trunk/ConsoleDataMigration/common/FileTransfer.h       | 3 +--
 4 files changed, 7 insertions(+), 16 deletions(-)

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);
 
 }