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