From 88d11db75acf1856016d904fa8ff61426ef4981d Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Tue, 1 Feb 2011 02:40:50 +0000
Subject: [PATCH] =?UTF-8?q?PANIC=E3=81=97=E3=81=AA=E3=81=84=E3=82=88?=
 =?UTF-8?q?=E3=81=86=E3=81=AB=20UpdateNetworkSetting=E3=81=A7=E3=81=AFFlus?=
 =?UTF-8?q?h=E3=81=97=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB?=
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@6 385bec56-5757-e545-9c3a-d8741f4650f1
---
 .../ConsoleRestore/Importer.cpp               | 19 +++++--------------
 .../ConsoleRestore/NtpClient.cpp              | 18 +++++++++---------
 2 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/trunk/ConsoleDataMigration/ConsoleRestore/Importer.cpp b/trunk/ConsoleDataMigration/ConsoleRestore/Importer.cpp
index f6f5a9c..00a024f 100644
--- a/trunk/ConsoleDataMigration/ConsoleRestore/Importer.cpp
+++ b/trunk/ConsoleDataMigration/ConsoleRestore/Importer.cpp
@@ -683,7 +683,7 @@ bool UpdateNetworkSetting(nn::ac::NetworkSetting& networkSetting)
     if(result.IsFailure())
     {
         retval = false;
-        NN_LOG("Error: nn::ac::InitializeInternal() failed\n");
+        COMMON_LOGGER("Error: nn::ac::InitializeInternal() failed\n");
     }
     else
     {
@@ -710,24 +710,15 @@ bool UpdateNetworkSetting(nn::ac::NetworkSetting& networkSetting)
         if(!result.IsSuccess())
         {
             retval = false;
-            NN_LOG("Error: SetNetworkSetting (Update Error)\n");
+            COMMON_LOGGER("Error: SetNetworkSetting (Update Error)\n");
         }
         else
         {
-            result = nn::ac::FlushNetworkSetting();
-            if(!result.IsSuccess())
+            result = nn::ac::FinalizeInternal();
+            if (!result.IsSuccess())
             {
                 retval = false;
-                NN_LOG("Error: SetNetworkSetting (Flush Error)\n");
-            }
-            else
-            {
-                result = nn::ac::FinalizeInternal();
-                if(!result.IsSuccess())
-                {
-                    retval = false;
-                    NN_LOG("Error: SetNetworkSetting (Finalize Error)\n");
-                }
+                COMMON_LOGGER("Error: SetNetworkSetting (Finalize Error)\n");
             }
         }
     }
diff --git a/trunk/ConsoleDataMigration/ConsoleRestore/NtpClient.cpp b/trunk/ConsoleDataMigration/ConsoleRestore/NtpClient.cpp
index ada8377..e114529 100644
--- a/trunk/ConsoleDataMigration/ConsoleRestore/NtpClient.cpp
+++ b/trunk/ConsoleDataMigration/ConsoleRestore/NtpClient.cpp
@@ -60,13 +60,13 @@ const u32 NTP_PORT_NUM = 123;
 
         nn::fs::Initialize();
         result = nn::ac::Initialize();
-        NN_UTIL_PANIC_IF_FAILED(result);
+        COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
 
         // 接続要求用のパラメータを作成
         result = nn::ac::CreateDefaultConfig( &config );
         if (result.IsFailure())
         {
-            NN_UTIL_PANIC_IF_FAILED(nn::ac::Finalize());
+            COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
             return result;
         }
 
@@ -77,7 +77,7 @@ const u32 NTP_PORT_NUM = 123;
         result = nn::ac::Connect( config );
         if (result.IsFailure())
         {
-            NN_UTIL_PANIC_IF_FAILED(nn::ac::Finalize());
+            COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
             return result;
         }
 
@@ -93,7 +93,7 @@ const u32 NTP_PORT_NUM = 123;
         NN_UTIL_RETURN_IF_FAILED(result);
 
         result = nn::ac::Finalize();
-        NN_UTIL_PANIC_IF_FAILED(result);
+        COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
 
         nn::fs::Finalize();
 
@@ -110,7 +110,7 @@ u32 GetNtpTime()
 
     // 本体に書き込まれているネットワーク設定を使ってネットワーク接続を初期化
     result = InitializeNetwork();
-    NN_UTIL_PANIC_IF_FAILED(result);
+    COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
 
     {
         NN_LOG("Initializing socket..\n");
@@ -128,7 +128,7 @@ u32 GetNtpTime()
 
         // ソケットライブラリの初期化
         result = nn::socket::Initialize(workMemoryAddress, workSizeForLibrary, bufferSizeForSockets, sessionCount);
-        NN_UTIL_PANIC_IF_FAILED(result);
+        COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
 
         {
             s32 ret;
@@ -251,7 +251,7 @@ u32 GetNtpTime()
             // サーバから時刻情報を受信する
             // サーバを指定して受信を行う
             // 受信するまで待たされる
-            if ((ret = nn::socket::RecvFrom(socket, reinterpret_cast<void*> (&s_NTPRecvPacket), sizeof(s_NTPRecvPacket), 0,
+            if ((ret = nn::socket::RecvFrom(socket, reinterpret_cast<void*> (&s_NTPRecvPacket), sizeof(s_NTPRecvPacket), nn::socket::MSG_DONTWAIT,
                     &serverSockAddrIn)) < 0)
             {
                 NN_LOG("Error: RecvFrom, %d\n", ret);
@@ -271,7 +271,7 @@ u32 GetNtpTime()
         NN_LOG("Finalizing socket..\n");
         // ソケットライブラリの終了
         result = nn::socket::Finalize();
-        NN_UTIL_PANIC_IF_FAILED(result);
+        COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
 
         // ソケットライブラリを Finalize すればワーク領域を再利用できます。
         delete[] pWorkMemory;
@@ -279,7 +279,7 @@ u32 GetNtpTime()
 
     NN_LOG("Finalizing network.\n");
     result = FinalizeNetwork();
-    NN_UTIL_PANIC_IF_FAILED(result);
+    COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
 
     return ntp_time;
 }