From ed19af46ab8df619b9dd233b05eda87d3005010a Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Mon, 18 Nov 2013 02:48:39 +0000
Subject: [PATCH] =?UTF-8?q?AcCompleter=20Result=E3=82=92=E8=BF=94=E3=81=99?=
 =?UTF-8?q?=E9=96=A2=E6=95=B0=E3=81=A8=E7=B5=90=E6=9E=9C=E3=81=AE=E4=BF=9D?=
 =?UTF-8?q?=E6=8C=81=E3=82=92=E5=88=86=E9=9B=A2?=
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@763 385bec56-5757-e545-9c3a-d8741f4650f1
---
 .../sources/ConsoleRestore/ActCompleter.cpp   | 34 +++++++++++--------
 .../sources/ConsoleRestore/ActCompleter.h     |  1 +
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/ActCompleter.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/ActCompleter.cpp
index a1d2b4e..be3b5e2 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/ActCompleter.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/ActCompleter.cpp
@@ -62,35 +62,41 @@ void ActCompleter::Finish()
 }
 
 void ActCompleter::Exec()
+{
+    s_Result = ExecImpl();
+}
+
+nn::Result ActCompleter::ExecImpl()
 {
     if(!nn::ac::IsConnected())
     {
-        s_Result = common::InitializeNetwork();
-        COMMON_LOGGER_RETURN_VOID_IF_FAILED(s_Result);
+        NN_UTIL_RETURN_IF_FAILED(
+                common::InitializeNetwork());
     }
 
-    s_Result = nn::act::InitializeAdmin();
-    COMMON_LOGGER_RETURN_VOID_IF_FAILED(s_Result);
+    NN_UTIL_RETURN_IF_FAILED(
+            nn::act::InitializeAdmin());
 
-    s_Result = nn::act::CompleteTransfer();
-    if(s_Result.IsFailure())
+    nn::Result result = nn::act::CompleteTransfer();
+    if(result.IsFailure())
     {
-        if (nn::act::ResultAccountNotLoaded().Includes(s_Result) || nn::act::ResultAuthenticationError().Includes(s_Result))
+        if (nn::act::ResultAccountNotLoaded().Includes(result) || nn::act::ResultAuthenticationError().Includes(result))
         {
-            // これらは発生する可能性があるので成功で上書きする
-            s_Result = nn::ResultSuccess();
+            // これらは発生する可能性があるので無視する
         }
         else
         {
-            COMMON_LOGGER_RETURN_VOID_IF_FAILED(s_Result);
+            return result;
         }
     }
 
-    s_Result = nn::act::FinalizeAdmin();
-    COMMON_LOGGER_RETURN_VOID_IF_FAILED(s_Result);
+    NN_UTIL_RETURN_IF_FAILED(
+            nn::act::FinalizeAdmin());
 
-    s_Result = common::FinalizeNetwork();
-    COMMON_LOGGER_RETURN_VOID_IF_FAILED(s_Result);
+    NN_UTIL_RETURN_IF_FAILED(
+            common::FinalizeNetwork());
+
+    return nn::ResultSuccess();
 }
 
 } /* namespace ConsoleRestore */
diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/ActCompleter.h b/trunk/ConsoleDataMigration/sources/ConsoleRestore/ActCompleter.h
index 5c391e1..d4b7f91 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/ActCompleter.h
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/ActCompleter.h
@@ -34,6 +34,7 @@ public:
 
 private:
     static void Exec();
+    static nn::Result ExecImpl();
     static nn::Result s_Result;
     static const size_t STACK_SIZE = 0x1000;
     static nn::os::Thread s_Thread;