From 2e62667703ea4b66dc12b1d7a897ae731d01049f Mon Sep 17 00:00:00 2001 From: N2614 Date: Sat, 4 Jun 2011 07:05:33 +0000 Subject: [PATCH] =?UTF-8?q?Release=E3=83=93=E3=83=AB=E3=83=89=E3=81=A7?= =?UTF-8?q?=E3=83=87=E3=83=90=E3=83=83=E3=82=B0=E5=87=BA=E5=8A=9B=E3=82=92?= =?UTF-8?q?=E8=A1=8C=E3=82=8F=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@313 385bec56-5757-e545-9c3a-d8741f4650f1 --- .../sources/ConsoleRestore/Importer.cpp | 2 +- .../ConsoleDataMigration/sources/ConsoleRestore/Shop.cpp | 2 +- .../sources/ConsoleRestore/Updater.cpp | 2 +- .../ConsoleDataMigration/sources/common/CommonLogger.cpp | 4 +--- trunk/ConsoleDataMigration/sources/common/CommonLogger.h | 8 ++++---- trunk/ConsoleDataMigration/sources/common/SdLogger.cpp | 4 ++-- .../sources/tests/common/util/test_Util.cpp | 2 +- 7 files changed, 11 insertions(+), 13 deletions(-) diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp index 7109698..91133bf 100644 --- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp +++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp @@ -853,7 +853,7 @@ bool ExistsIvsDirectory(std::string& ivsRoot) result = dir.TryInitialize(common::SD_NINTENDO_3DS_ROOT_PATH); if(result.IsFailure()) { - nn::dbg::PrintResult(result); + NN_DBG_PRINT_RESULT(result); common::SdMountManager::Unmount(); return false; } diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Shop.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Shop.cpp index e4ea106..efd3931 100644 --- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Shop.cpp +++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Shop.cpp @@ -37,7 +37,7 @@ do { \ nn::nim::Shop::GetCustomerSupportCode(&csc); \ COMMON_LOGGER("CSCode: %d\n", csc); \ COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result); \ - nn::dbg::PrintResult(result); \ + NN_DBG_PRINT_RESULT(result); \ COMMON_LOGGER_DEBUG("Result = %08X\n", result.GetPrintableBits()); \ s_ShopResult = result; \ return; \ diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Updater.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Updater.cpp index c72289f..3dbb1f7 100644 --- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Updater.cpp +++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Updater.cpp @@ -42,7 +42,7 @@ do { \ nn::nim::Updater::GetCustomerSupportCode(&csc)); \ COMMON_LOGGER("CSCode: %d\n", csc); \ COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result); \ - nn::dbg::PrintResult(result); \ + NN_DBG_PRINT_RESULT(result); \ COMMON_LOGGER_DEBUG("Result = %08X\n", result.GetPrintableBits()); \ s_Result = result; \ goto LABEL_FINALIZE; \ diff --git a/trunk/ConsoleDataMigration/sources/common/CommonLogger.cpp b/trunk/ConsoleDataMigration/sources/common/CommonLogger.cpp index 59db5dc..c77bd09 100644 --- a/trunk/ConsoleDataMigration/sources/common/CommonLogger.cpp +++ b/trunk/ConsoleDataMigration/sources/common/CommonLogger.cpp @@ -57,9 +57,7 @@ void CommonLogger::Print(const char* fmt, ...) va_start(vlist, fmt); -#ifdef NN_BUILD_VERBOSE - nn::dbg::detail::VPrintf(fmt, vlist); -#endif + NN_LOGV(fmt, vlist); GetSdInstance()->Print(fmt, vlist); GetConsoleInstance()->AddText(fmt, vlist); diff --git a/trunk/ConsoleDataMigration/sources/common/CommonLogger.h b/trunk/ConsoleDataMigration/sources/common/CommonLogger.h index 4c6c4d8..1891295 100644 --- a/trunk/ConsoleDataMigration/sources/common/CommonLogger.h +++ b/trunk/ConsoleDataMigration/sources/common/CommonLogger.h @@ -23,7 +23,7 @@ #define COMMON_LOGGER( ... ) (void)common::Logger::GetLoggerInstance()->Print(__VA_ARGS__) #define COMMON_LOGGER_RESULT(result, func) \ - (void)nn::dbg::PrintResult(result); \ + NN_DBG_PRINT_RESULT(result); \ (void)common::Logger::GetLoggerInstance()->PrintResultSdLog("Func = %s\n", func); \ (void)common::Logger::GetLoggerInstance()->PrintResultSdLog("Result = %X\n", result.GetPrintableBits()); \ @@ -34,9 +34,9 @@ #endif // ifndef NN_SWITCH_DISABLE_DEBUG_PRINT else #define COMMON_LOGGER_RESULT_WITH_LINE(result, line, func) \ - (void)nn::dbg::detail::Printf("%s\n", func); \ - (void)nn::dbg::detail::Printf("%d\n", line); \ - (void)nn::dbg::PrintResult(result); \ + NN_LOG("%s\n", func); \ + NN_LOG("%d\n", line); \ + NN_DBG_PRINT_RESULT(result); \ (void)common::Logger::GetLoggerInstance()->PrintResultSdLog("Func = %s\n", func); \ (void)common::Logger::GetLoggerInstance()->PrintResultSdLog("line = %d\n", line); \ (void)common::Logger::GetLoggerInstance()->PrintResultSdLog("Result = %X\n", result.GetPrintableBits()); \ diff --git a/trunk/ConsoleDataMigration/sources/common/SdLogger.cpp b/trunk/ConsoleDataMigration/sources/common/SdLogger.cpp index 50a3589..9851395 100644 --- a/trunk/ConsoleDataMigration/sources/common/SdLogger.cpp +++ b/trunk/ConsoleDataMigration/sources/common/SdLogger.cpp @@ -46,7 +46,7 @@ void PrintResultIfFailed(nn::Result result, u32 line = 0) { NN_LOG("%s, %d\n", __FILE__, line); } - nn::dbg::PrintResult(result); + NN_DBG_PRINT_RESULT(result); } } @@ -224,7 +224,7 @@ void SdLogger::Clear() result = nn::fs::TryDeleteFile(log.c_str()); if(result.IsFailure()) { - nn::dbg::PrintResult(result); + NN_DBG_PRINT_RESULT(result); } SdMountManager::Unmount(); diff --git a/trunk/ConsoleDataMigration/sources/tests/common/util/test_Util.cpp b/trunk/ConsoleDataMigration/sources/tests/common/util/test_Util.cpp index 0a05490..1fa18c4 100644 --- a/trunk/ConsoleDataMigration/sources/tests/common/util/test_Util.cpp +++ b/trunk/ConsoleDataMigration/sources/tests/common/util/test_Util.cpp @@ -108,7 +108,7 @@ void UtilTest::GetSaveDataDirectoryRoot() result = fis.TryRead(&readSize, ivs, ivsSize); if (result.IsFailure()) { - nn::dbg::PrintResult(result); + NN_DBG_PRINT_RESULT(result); NN_TEST_FAIL("Can't Read IVS"); } }