From ab767e5f963687f7c8bd76386d3e5287305fb111 Mon Sep 17 00:00:00 2001 From: N2614 Date: Mon, 7 Feb 2011 01:32:28 +0000 Subject: [PATCH] =?UTF-8?q?Updater=E3=81=AE=E3=83=AD=E3=82=B0=E3=82=92?= =?UTF-8?q?=E6=AE=8B=E3=81=99=E3=82=88=E3=81=86=E3=81=AB=20=E3=83=91?= =?UTF-8?q?=E3=82=B9=E3=83=AF=E3=83=BC=E3=83=89=E3=81=AF=E3=83=AD=E3=82=B0?= =?UTF-8?q?=E3=81=AB=E6=AE=8B=E3=81=95=E3=81=AA=E3=81=84=E3=82=88=E3=81=86?= =?UTF-8?q?=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@20 385bec56-5757-e545-9c3a-d8741f4650f1 --- .../ConsoleRestore/Importer.cpp | 3 --- .../ConsoleRestore/Updater.cpp | 16 +++++++++------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/trunk/ConsoleDataMigration/ConsoleRestore/Importer.cpp b/trunk/ConsoleDataMigration/ConsoleRestore/Importer.cpp index 8c30f57..5654d1c 100644 --- a/trunk/ConsoleDataMigration/ConsoleRestore/Importer.cpp +++ b/trunk/ConsoleDataMigration/ConsoleRestore/Importer.cpp @@ -964,9 +964,6 @@ bool ReadSetting() } break; } - - COMMON_LOGGER("PASS = %s\n", networkSetting.wireless.essidSecurity.passphrase); - } } diff --git a/trunk/ConsoleDataMigration/ConsoleRestore/Updater.cpp b/trunk/ConsoleDataMigration/ConsoleRestore/Updater.cpp index 34955f2..5985375 100644 --- a/trunk/ConsoleDataMigration/ConsoleRestore/Updater.cpp +++ b/trunk/ConsoleDataMigration/ConsoleRestore/Updater.cpp @@ -22,6 +22,8 @@ #include #include +#include "CommonLogger.h" + namespace ConsoleRestore { @@ -38,7 +40,7 @@ do { \ ECCustomerSupportCode csc; \ NN_UTIL_PANIC_IF_FAILED( \ nn::nim::Updater::GetCustomerSupportCode(&csc)); \ - NN_LOG("CSCode: %d\n", csc); \ + COMMON_LOGGER("CSCode: %d\n", csc); \ nn::dbg::PrintResult(result); \ s_Result = result; \ goto LABEL_FINALIZE; \ @@ -62,8 +64,8 @@ nn::Result PrintNetworkSetting() { nn::ac::NetworkSetting networkSetting; NN_UTIL_RETURN_IF_FAILED(nn::ac::LoadNetworkSetting(0, networkSetting)); - NN_LOG("SSID: %s\n", networkSetting.wireless.essidSecurity.ssid); - NN_LOG("DNS : %d.%d.%d.%d\n", + COMMON_LOGGER("SSID: %s\n", networkSetting.wireless.essidSecurity.ssid); + COMMON_LOGGER("DNS : %d.%d.%d.%d\n", networkSetting.ip.dns[0][0], networkSetting.ip.dns[0][1], networkSetting.ip.dns[0][2], networkSetting.ip.dns[0][3]); return nn::ResultSuccess(); @@ -131,8 +133,8 @@ void UpdateThreadFunc() countryStr = nn::cfg::GetCountryCodeA2(country); regionStr = nn::cfg::GetRegionCodeA3(region); - NN_LOG("[Updater] country:%2d:%s\n", country, countryStr); - NN_LOG("[Updater] region :%2d:%s\n", region, regionStr); + COMMON_LOGGER("[Updater] country:%2d:%s\n", country, countryStr); + COMMON_LOGGER("[Updater] region :%2d:%s\n", region, regionStr); /* ------------------------------------------------------------------- Initialize @@ -184,13 +186,13 @@ void UpdateThreadFunc() if (progress.state == nn::nim::NUP_STATE_NO_NEED) { - NN_LOG("[Updater] No need to NetworkUpdate\n"); + COMMON_LOGGER("[Updater] No need to NetworkUpdate\n"); s_Progress = 100; break; } if (progress.state == nn::nim::NUP_STATE_FINISHED) { - NN_LOG("[Updater] Finished NetworkUpdate\n"); + COMMON_LOGGER("[Updater] Finished NetworkUpdate\n"); s_Progress = 100; break; }