From 6e20c3e0ac45272d88c1ca10e8c29b69c8502c24 Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Fri, 27 Jan 2012 02:30:01 +0000
Subject: [PATCH] =?UTF-8?q?=E3=83=AA=E3=83=93=E3=82=B8=E3=83=A7=E3=83=B3?=
 =?UTF-8?q?=20611=20=E3=82=92=20trunk/ConsoleDataMigration/sources/common/?=
 =?UTF-8?q?CommonLogger.h=20=E3=81=8B=E3=82=89=E3=83=9E=E3=83=BC=E3=82=B8:?=
 =?UTF-8?q?=20Result=E3=82=92=E5=8F=96=E3=82=8A=E3=81=93=E3=81=BC=E3=81=97?=
 =?UTF-8?q?=E3=81=A6=E3=81=84=E3=81=9F=E3=81=AE=E3=81=A7=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=20........=20MICRO=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7?=
 =?UTF-8?q?=E3=83=B3=E3=82=92=E8=BF=BD=E5=8A=A0?=
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@613 385bec56-5757-e545-9c3a-d8741f4650f1
---
 .../sources/ConsoleBackup/ConsoleBackup.cpp   |  2 +-
 .../sources/ConsoleBackup/Exporter.cpp        | 12 +--
 .../sources/ConsoleRestore/Controller.cpp     |  2 +-
 .../sources/ConsoleRestore/Importer.cpp       | 28 +++----
 .../sources/ConsoleRestore/NtpClient.cpp      | 16 ++--
 .../sources/ConsoleRestore/Shop.cpp           | 14 ++--
 .../ConsoleRestore/TitleDownloader.cpp        |  4 +-
 .../sources/ConsoleRestore/Updater.cpp        |  2 +-
 .../sources/common/CommonLogger.h             | 84 +++++++++++--------
 .../sources/common/FileTransfer.cpp           |  6 +-
 .../1stNUP_for_2ndNUP/sources/common/Util.cpp | 10 +--
 .../sources/common/VersionDetect.cpp          | 12 +--
 .../sources/common/version.h                  |  1 +
 .../sources/tools/CmacAdder/main.cpp          |  2 +-
 .../tools/ExportedDataDecrypter/main.cpp      | 16 ++--
 .../tools/ExportedDataVerifier/main.cpp       | 14 ++--
 .../sources/tools/FatDataEncrypter/main.cpp   |  2 +-
 17 files changed, 123 insertions(+), 104 deletions(-)

diff --git a/branches/1stNUP_for_2ndNUP/sources/ConsoleBackup/ConsoleBackup.cpp b/branches/1stNUP_for_2ndNUP/sources/ConsoleBackup/ConsoleBackup.cpp
index d595a02..f6d15c0 100644
--- a/branches/1stNUP_for_2ndNUP/sources/ConsoleBackup/ConsoleBackup.cpp
+++ b/branches/1stNUP_for_2ndNUP/sources/ConsoleBackup/ConsoleBackup.cpp
@@ -87,7 +87,7 @@ extern "C" void nnMain(void)
 
     // hid の初期化
     result = nn::hid::Initialize();
-    COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+    COMMON_LOGGER_RESULT_IF_FAILED(result);
 
     // cfg の初期化
     nn::cfg::CTR::init::Initialize();
diff --git a/branches/1stNUP_for_2ndNUP/sources/ConsoleBackup/Exporter.cpp b/branches/1stNUP_for_2ndNUP/sources/ConsoleBackup/Exporter.cpp
index b7e6470..73d055e 100644
--- a/branches/1stNUP_for_2ndNUP/sources/ConsoleBackup/Exporter.cpp
+++ b/branches/1stNUP_for_2ndNUP/sources/ConsoleBackup/Exporter.cpp
@@ -502,7 +502,7 @@ void WriteTwlData(enum common::TWL_PATH_INDEX path)
     {
         nn::fs::FileOutputStream list;
         result = list.TryInitialize(common::FILE_LIST_PATHNAME, true);
-        COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+        COMMON_LOGGER_RESULT_IF_FAILED(result);
         if (result.IsSuccess())
         {
             result = list.TryGetSize(&fileSize);
@@ -763,7 +763,7 @@ void ExportThreadFunc()
     s_IsExportSucceeded = true;
 
     result = nn::fs::MountSpecialArchive(common::NAND_ARCHIVE_NAME, nn::fs::CTR::ARCHIVE_TYPE_CTR_NAND);
-    COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+    COMMON_LOGGER_RESULT_IF_FAILED(result);
 
     result = common::SdMountManager::Mount();
 
@@ -780,7 +780,7 @@ void ExportThreadFunc()
     {
         nn::fs::FileOutputStream list;
         result = list.TryInitialize(common::FILE_LIST_PATHNAME, true);
-        COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+        COMMON_LOGGER_RESULT_IF_FAILED(result);
         if (result.IsSuccess())
         {
             s64 fileSize;
@@ -890,7 +890,7 @@ bool DeleteNimSaveData()
     result = nn::fs::TryDeleteDirectoryRecursively(nimSaveDataPath.c_str());
     if (result.IsFailure() && !nn::fs::ResultNotFound::Includes(result))
     {
-        COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+        COMMON_LOGGER_RESULT_IF_FAILED(result);
         return false;
     }
 
@@ -993,11 +993,11 @@ void AddCmac(nn::fs::FileOutputStream* file, nn::crypto::Sha256Context* context)
 
     bit8 cmac[nn::crypto::AES_CMAC_MAC_SIZE];
     result = nn::crypto::CalculateAesCmacSw(cmac, sha256Hash, nn::crypto::Sha256Context::HASH_SIZE, common::cmacKey);
-    COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+    COMMON_LOGGER_RESULT_IF_FAILED(result);
 
     s32 writeSize;
     result = file->TryWrite(&writeSize, cmac, sizeof(cmac), false);
-    COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+    COMMON_LOGGER_RESULT_IF_FAILED(result);
 
 }
 
diff --git a/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/Controller.cpp b/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/Controller.cpp
index 888f461..6a16d7b 100644
--- a/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/Controller.cpp
+++ b/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/Controller.cpp
@@ -1128,7 +1128,7 @@ void ControlState(common::HardwareStateManager& manager, ::std::vector<std::stri
         case READ_FILELIST:
         {
             result = SetupFileList();
-            COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+            COMMON_LOGGER_RESULT_IF_FAILED(result);
 
             if (result.IsSuccess())
             {
diff --git a/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/Importer.cpp b/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/Importer.cpp
index fed88e8..95d5c1d 100644
--- a/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/Importer.cpp
+++ b/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/Importer.cpp
@@ -511,7 +511,7 @@ nn::Result ImportMcuRtc(common::HardwareStateManager& manager)
                     for (u8 i = 0; i < RETRY; i++)
                     {
                         result = mcu.WriteBySend(nn::drivers::mcu::CTR::MCU_RTC_SEC_ADDR, bcd, RTC_PARAM_SIZE);
-                        COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+                        COMMON_LOGGER_RESULT_IF_FAILED(result);
 
                         if(result.IsSuccess())
                         {
@@ -1450,14 +1450,14 @@ bool ReadSetting(bool* nupOnly, bool* getIvs, bool* checkSd, bool* skipNup)
         else
         {
             NN_LOG("configfileLoader Initialize Failed\n");
-            COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+            COMMON_LOGGER_RESULT_IF_FAILED(result);
             retval = false;
         }
     }
     else
     {
         NN_LOG("Can't Allocate Heap\n");
-        COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+        COMMON_LOGGER_RESULT_IF_FAILED(result);
         retval = false;
     }
 
@@ -1715,45 +1715,45 @@ nn::Result InitializeHardwareDependentSetting()
 
     result = nn::cfg::CTR::init::SetConfig(GET_CFG_KEY(NN_CFG_HID, NN_CFG_HID_CAL_TOUCHPANEL),
             &cfgCalData.touchPanelCfgData, sizeof(TouchPanelCfgData));
-    COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+    COMMON_LOGGER_RESULT_IF_FAILED(result);
 
     result = nn::cfg::CTR::init::SetConfig(GET_CFG_KEY(NN_CFG_LCD, NN_CFG_LCD_CAL_FLICKER),
             &cfgCalData.lcdFlickerCfgData, sizeof(LcdFlickerCfgData));
-    COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+    COMMON_LOGGER_RESULT_IF_FAILED(result);
 
     result = nn::cfg::CTR::init::SetConfig(GET_CFG_KEY(NN_CFG_FCRAM, NN_CFG_FCRAM_CAL_DELAY), &cfgCalData.fcramCfgData,
             sizeof(FcramCfgData));
-    COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+    COMMON_LOGGER_RESULT_IF_FAILED(result);
 
     result = nn::cfg::CTR::init::SetConfig(GET_CFG_KEY(NN_CFG_RTC, NN_CFG_RTC_CAL_COMPENSATION),
             &cfgCalData.rtcCfgData, sizeof(RtcCfgData));
-    COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+    COMMON_LOGGER_RESULT_IF_FAILED(result);
 
     result = nn::cfg::CTR::init::SetConfig(GET_CFG_KEY(NN_CFG_HID, NN_CFG_HID_CAL_GYROSCOPE),
             &cfgCalData.gyroscopeCfgData, sizeof(GyroscopeCfgData));
-    COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+    COMMON_LOGGER_RESULT_IF_FAILED(result);
 
     result = nn::cfg::CTR::init::SetConfig(GET_CFG_KEY(NN_CFG_HID, NN_CFG_HID_CAL_ACCELEROMETER),
             &cfgCalData.accelCfgData, sizeof(AccelCfgData));
-    COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+    COMMON_LOGGER_RESULT_IF_FAILED(result);
 
     result = nn::cfg::CTR::init::SetConfig(GET_CFG_KEY(NN_CFG_CODEC, NN_CFG_CODEC_CAL), &cfgCalData.codecCfgData,
             sizeof(CodecCfgData));
-    COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+    COMMON_LOGGER_RESULT_IF_FAILED(result);
 
     result = nn::cfg::CTR::init::SetConfig(GET_CFG_KEY(NN_CFG_MCU, NN_CFG_MCU_SLIDE_VOLUME),
             &cfgCalData.mcuSlideVolumeRangeCfgData, sizeof(McuSlideVolumeRangeCfgData));
-    COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+    COMMON_LOGGER_RESULT_IF_FAILED(result);
 
     NN_LOG("Set cfgCalData\n");
 
-    COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+    COMMON_LOGGER_RESULT_IF_FAILED(result);
 
     nn::cfg::CTR::init::ResetCameraCalibration();
-    COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+    COMMON_LOGGER_RESULT_IF_FAILED(result);
 
     nn::cfg::CTR::init::ResetAnalogStickCalibration();
-    COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+    COMMON_LOGGER_RESULT_IF_FAILED(result);
 
     return result;
 }
diff --git a/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/NtpClient.cpp b/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/NtpClient.cpp
index b92040c..53335d3 100644
--- a/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/NtpClient.cpp
+++ b/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/NtpClient.cpp
@@ -60,13 +60,13 @@ nn::Result InitializeNetwork(void)
     nn::ac::Config config;
 
     result = nn::ac::Initialize();
-    COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+    COMMON_LOGGER_RESULT_IF_FAILED(result);
 
     // 接続要求用のパラメータを作成
     result = nn::ac::CreateDefaultConfig(&config);
     if (result.IsFailure())
     {
-        COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+        COMMON_LOGGER_RESULT_IF_FAILED(result);
         return result;
     }
 
@@ -77,7 +77,7 @@ nn::Result InitializeNetwork(void)
     result = nn::ac::ConnectWithoutEula(config);
     if (result.IsFailure())
     {
-        COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+        COMMON_LOGGER_RESULT_IF_FAILED(result);
         return result;
     }
 
@@ -93,7 +93,7 @@ nn::Result FinalizeNetwork(void)
     NN_UTIL_RETURN_IF_FAILED(result);
 
     result = nn::ac::Finalize();
-    COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+    COMMON_LOGGER_RESULT_IF_FAILED(result);
 
     return nn::ResultSuccess();
 }
@@ -107,7 +107,7 @@ bool GetNtpTime(u32* ntpTime)
 
     // 本体に書き込まれているネットワーク設定を使ってネットワーク接続を初期化
     result = InitializeNetwork();
-    COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+    COMMON_LOGGER_RESULT_IF_FAILED(result);
 
     {
         NN_LOG("Initializing socket..\n");
@@ -125,7 +125,7 @@ bool GetNtpTime(u32* ntpTime)
 
         // ソケットライブラリの初期化
         result = nn::socket::Initialize(workMemoryAddress, workSizeForLibrary, bufferSizeForSockets, sessionCount);
-        COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+        COMMON_LOGGER_RESULT_IF_FAILED(result);
 
         {
             s32 ret;
@@ -272,12 +272,12 @@ bool GetNtpTime(u32* ntpTime)
         NN_LOG("Finalizing socket..\n");
         // ソケットライブラリの終了
         result = nn::socket::Finalize();
-        COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+        COMMON_LOGGER_RESULT_IF_FAILED(result);
     }
 
     NN_LOG("Finalizing network.\n");
     result = FinalizeNetwork();
-    COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+    COMMON_LOGGER_RESULT_IF_FAILED(result);
 
     return retval;
 }
diff --git a/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/Shop.cpp b/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/Shop.cpp
index 3a1b0bd..14c38a0 100644
--- a/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/Shop.cpp
+++ b/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/Shop.cpp
@@ -36,7 +36,7 @@ do {                                     \
     	ECCustomerSupportCode csc;                              \
     	nn::nim::Shop::GetCustomerSupportCode(&csc);            \
         COMMON_LOGGER("CSCode: %d\n", csc);                     \
-        COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);       \
+        COMMON_LOGGER_RESULT_IF_FAILED(result);       \
         NN_DBG_PRINT_RESULT(result);                             \
         COMMON_LOGGER_DETAIL("Result = %08X\n", result.GetPrintableBits());   \
         s_ShopResult = result;                                  \
@@ -219,17 +219,17 @@ nn::Result ConnectNetwork()
     nn::ac::Config config;
 
     result = nn::ac::CreateDefaultConfig(&config);
-    COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+    COMMON_LOGGER_RESULT_IF_FAILED(result);
     NN_UTIL_RETURN_IF_FAILED(result);
 
     result = nn::ac::ConnectWithoutEula(config);
-    COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+    COMMON_LOGGER_RESULT_IF_FAILED(result);
     NN_UTIL_RETURN_IF_FAILED(result);
 
     COMMON_LOGGER_DETAIL("Success nn::ac::ConnectWithoutEula\n");
 
     result = PrintNetworkSetting();
-    COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+    COMMON_LOGGER_RESULT_IF_FAILED(result);
     NN_UTIL_RETURN_IF_FAILED(result);
 
     return result;
@@ -240,11 +240,11 @@ nn::Result InitializeInternal()
     nn::Result result;
 
     result = nn::ac::InitializeInternal();
-    COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+    COMMON_LOGGER_RESULT_IF_FAILED(result);
     NN_UTIL_RETURN_IF_FAILED(result);
 
     result = ConnectNetwork();
-    COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+    COMMON_LOGGER_RESULT_IF_FAILED(result);
     NN_UTIL_RETURN_IF_FAILED(result);
 
     return result;
@@ -414,7 +414,7 @@ void ShopOperationSingleThreadFunc(ShopThreadParam param)
 
     COMMON_LOGGER_DETAIL("util::ac::Initialize\n");
     result = InitializeInternal();
-    COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+    COMMON_LOGGER_RESULT_IF_FAILED(result);
     NIM_SHOP_RESULT_CHECK(result);
 
     switch(param.op)
diff --git a/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/TitleDownloader.cpp b/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/TitleDownloader.cpp
index 2960c36..2545ad4 100644
--- a/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/TitleDownloader.cpp
+++ b/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/TitleDownloader.cpp
@@ -207,7 +207,7 @@ void TitleDownloader::Start()
 
         nn::nim::TitleConfig config;
         m_Result = GetTitleConfig(m_ProgramIdList[i], &config);
-        COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(m_Result);
+        COMMON_LOGGER_RESULT_IF_FAILED(m_Result);
         if (m_Result.IsSuccess())
         {
             StartShopOperationSingle(SHOP_OPERATION_DOWNLOAD_TITLE, config);
@@ -233,7 +233,7 @@ nn::Result TitleDownloader::ListUp()
     {
         common::SdReaderWriter sdReader;
         m_Result = sdReader.ReadBufWithCmac(common::TWL_TITLELIST_PATHNAME, titleListBuf, heapSize, &readSize);
-        COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(m_Result);
+        COMMON_LOGGER_RESULT_IF_FAILED(m_Result);
         if (m_Result.IsSuccess())
         {
             u32 listHead = 0;
diff --git a/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/Updater.cpp b/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/Updater.cpp
index 55addb4..ee87db8 100644
--- a/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/Updater.cpp
+++ b/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/Updater.cpp
@@ -41,7 +41,7 @@ do {                                     \
         NN_UTIL_PANIC_IF_FAILED(                                \
             nn::nim::Updater::GetCustomerSupportCode(&csc));    \
         COMMON_LOGGER("CSCode: %d\n", csc);                            \
-        COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);       \
+        COMMON_LOGGER_RESULT_IF_FAILED(result);       \
         NN_DBG_PRINT_RESULT(result);                             \
         COMMON_LOGGER_DETAIL("Result = %08X\n", result.GetPrintableBits());   \
         s_Result = result;                                      \
diff --git a/branches/1stNUP_for_2ndNUP/sources/common/CommonLogger.h b/branches/1stNUP_for_2ndNUP/sources/common/CommonLogger.h
index 208bd82..0eecdc3 100644
--- a/branches/1stNUP_for_2ndNUP/sources/common/CommonLogger.h
+++ b/branches/1stNUP_for_2ndNUP/sources/common/CommonLogger.h
@@ -65,49 +65,67 @@
     (void)common::Logger::GetLoggerInstance()->PrintResultSdLog("Result = %X\n", result.GetPrintableBits()); \
 
 #define COMMON_LOGGER_RESULT_IF_FAILED(result)  \
-    if(result.IsFailure())                       \
-    {                                            \
-        COMMON_LOGGER_RESULT(result, __func__);  \
-    }                                            \
-
-#define COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result)            \
-    if(result.IsFailure())                                           \
-    {                                                                \
-        COMMON_LOGGER_RESULT_WITH_LINE(result, __LINE__, __func__);  \
-    }                                                                \
+    do \
+    { \
+        ::nn::Result commonLoggerResult = (result); \
+        if(commonLoggerResult.IsFailure())                       \
+        {                                            \
+            COMMON_LOGGER_RESULT(commonLoggerResult, __func__);  \
+        }                                            \
+    }while(0)
 
 #define COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result) \
-    if(result.IsFailure())                                   \
-    {                                                        \
-        COMMON_LOGGER_RESULT_WITH_LINE(result, __LINE__, __func__);  \
-        return result;                                              \
-    }                                                                \
+    do \
+    { \
+        ::nn::Result commonLoggerResult = (result); \
+        if(commonLoggerResult.IsFailure())                       \
+        {                                                        \
+        COMMON_LOGGER_RESULT_WITH_LINE(commonLoggerResult, __LINE__, __func__);  \
+        return commonLoggerResult;                                              \
+        }                                                                \
+    }while(0)
 
 #define COMMON_LOGGER_RETURN_FALSE_IF_FAILED(result) \
-    if(result.IsFailure())                                   \
-    {                                                        \
-        COMMON_LOGGER_RESULT_WITH_LINE(result, __LINE__, __func__);  \
-        return false;                                               \
-    }                                                                \
+    do \
+    { \
+        ::nn::Result commonLoggerResult = (result); \
+        if(commonLoggerResult.IsFailure())                                   \
+        {                                                        \
+            COMMON_LOGGER_RESULT_WITH_LINE(commonLoggerResult, __LINE__, __func__);  \
+            return false;                                               \
+        }                                                                \
+    }while(0)
 
 #define COMMON_LOGGER_RETURN_VOID_IF_FAILED(result) \
-    if(result.IsFailure())                                   \
-    {                                                        \
-        COMMON_LOGGER_RESULT_WITH_LINE(result, __LINE__, __func__);  \
-        return;                                                     \
-    }                                                                \
+    do \
+    { \
+        ::nn::Result commonLoggerResult = (result); \
+        if(commonLoggerResult.IsFailure())                                   \
+        {                                                        \
+            COMMON_LOGGER_RESULT_WITH_LINE(commonLoggerResult, __LINE__, __func__);  \
+            return;                                                     \
+        }                                                                \
+    }while(0)
 
 #define COMMON_LOGGER_RETURN_VOID_SET_BOOL_IF_FAILED(result, setbool) \
-    if(result.IsFailure())                                   \
-    {                                                        \
-        COMMON_LOGGER_RESULT_WITH_LINE(result, __LINE__, __func__);  \
-        setbool = false;                                            \
-        return;                                                     \
-    }                                                                \
+    do \
+    { \
+        ::nn::Result commonLoggerResult = (result); \
+        if(commonLoggerResult.IsFailure())                                   \
+        {                                                        \
+            COMMON_LOGGER_RESULT_WITH_LINE(commonLoggerResult, __LINE__, __func__);  \
+            setbool = false;                                            \
+            return;                                                     \
+        }                                                                \
+    }while(0)
 
 #define COMMON_LOGGER_RETURN_FALSE(result) \
-    COMMON_LOGGER_RESULT_WITH_LINE(result, __LINE__, __func__);  \
-    return false;                                               \
+    do \
+    { \
+        ::nn::Result commonLoggerResult = (result); \
+        COMMON_LOGGER_RESULT_WITH_LINE(commonLoggerResult, __LINE__, __func__);  \
+        return false;                                               \
+    }while(0)
 
 namespace common
 {
diff --git a/branches/1stNUP_for_2ndNUP/sources/common/FileTransfer.cpp b/branches/1stNUP_for_2ndNUP/sources/common/FileTransfer.cpp
index 5474037..aae13bc 100644
--- a/branches/1stNUP_for_2ndNUP/sources/common/FileTransfer.cpp
+++ b/branches/1stNUP_for_2ndNUP/sources/common/FileTransfer.cpp
@@ -625,7 +625,7 @@ bool VerifyMac(nn::fs::FileInputStream* sdFile, nn::fs::FileStream* nandFile, s6
         result = nandFile->TryRead(&readSize, buf, bufSize / 2);
         if (result.IsFailure())
         {
-            COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+            COMMON_LOGGER_RESULT_IF_FAILED(result);
             retValue = false;
             break;
         }
@@ -648,7 +648,7 @@ bool VerifyMac(nn::fs::FileInputStream* sdFile, nn::fs::FileStream* nandFile, s6
 
                 if (result.IsFailure())
                 {
-                    COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+                    COMMON_LOGGER_RESULT_IF_FAILED(result);
                     retValue = false;
                     break;
                 }
@@ -689,7 +689,7 @@ bool ConfirmFile(nn::fs::FileInputStream* from_file, nn::fs::FileStream* to_file
 
         // 正しいファイル名にリネームする
         result = nn::fs::TryRenameFile(tmpPath, truePath);
-        COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+        COMMON_LOGGER_RESULT_IF_FAILED(result);
         if (result.IsFailure())
         {
             COMMON_LOGGER("**********Verification Failed %s, Delete**********\n", GetCharStr(sdPath));
diff --git a/branches/1stNUP_for_2ndNUP/sources/common/Util.cpp b/branches/1stNUP_for_2ndNUP/sources/common/Util.cpp
index bb52b06..d46e743 100644
--- a/branches/1stNUP_for_2ndNUP/sources/common/Util.cpp
+++ b/branches/1stNUP_for_2ndNUP/sources/common/Util.cpp
@@ -63,7 +63,7 @@ void Util::InitializeForRestore()
     // フレンドコードの取得
     nn::friends::CTR::FriendKey friendKey;
     result = nn::friends::CTR::GetMyFriendKey(&friendKey);
-    COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+    COMMON_LOGGER_RESULT_IF_FAILED(result);
     m_FriendCode = nn::friends::CTR::FriendKeyToFriendCode(friendKey);
 
     m_HasReadFriendCode = true;
@@ -116,13 +116,13 @@ void Util::Initialize()
     {
         m_CanReadSerialNumber = true;
     }
-    COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+    COMMON_LOGGER_RESULT_IF_FAILED(result);
     AddCheckDigit(reinterpret_cast<char*>(m_SerialNo));
 
 
     // デバイスIDの取得
     result = nn::ps::CTR::GetDeviceId(&m_DeviceId);
-    COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+    COMMON_LOGGER_RESULT_IF_FAILED(result);
 
     // リージョンの取得
     m_Region = nn::cfg::CTR::GetRegion();
@@ -134,9 +134,9 @@ void Util::Initialize()
     nn::nwm::Mac mac;
 
     result = nn::nwm::GetMacAddress(mac);
-    COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+    COMMON_LOGGER_RESULT_IF_FAILED(result);
     mac.GetString(m_MacAddress);
-    COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+    COMMON_LOGGER_RESULT_IF_FAILED(result);
 }
 
 void Util::FinalizeForBackup()
diff --git a/branches/1stNUP_for_2ndNUP/sources/common/VersionDetect.cpp b/branches/1stNUP_for_2ndNUP/sources/common/VersionDetect.cpp
index 09977cd..3d5c898 100644
--- a/branches/1stNUP_for_2ndNUP/sources/common/VersionDetect.cpp
+++ b/branches/1stNUP_for_2ndNUP/sources/common/VersionDetect.cpp
@@ -33,12 +33,12 @@ void GetCupVersion(nn::pl::CTR::CardUpdateVersion* cup, nn::cfg::CTR::CfgRegionC
     {
         result = nn::fs::MountContent("cver:", nn::fs::MEDIA_TYPE_NAND, common::cCupVerId[region], 0, 1, 1, buf,
                 BUF_SIZE);
-        COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+        COMMON_LOGGER_RESULT_IF_FAILED(result);
 
         nn::fs::FileInputStream fis;
 
         result = fis.TryInitialize(L"cver:/version.bin");
-        COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+        COMMON_LOGGER_RESULT_IF_FAILED(result);
         if (result.IsSuccess())
         {
             s64 fileSize = fis.GetSize();
@@ -50,7 +50,7 @@ void GetCupVersion(nn::pl::CTR::CardUpdateVersion* cup, nn::cfg::CTR::CfgRegionC
             if (addr != NULL)
             {
                 result = fis.TryRead(&ret, addr, fileSize);
-                COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+                COMMON_LOGGER_RESULT_IF_FAILED(result);
                 if (result.IsSuccess())
                 {
                     nn::pl::CTR::CardUpdateVersion* ver_buf = reinterpret_cast<nn::pl::CTR::CardUpdateVersion*> (addr);
@@ -76,12 +76,12 @@ void GetNupVersion(nn::pl::CTR::NetworkUpdateVersion* nup, nn::cfg::CTR::CfgRegi
     {
         result = nn::fs::MountContent("nver:", nn::fs::MEDIA_TYPE_NAND, common::cNupVerId[region], 0, 1, 1, buf,
                 BUF_SIZE);
-        COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+        COMMON_LOGGER_RESULT_IF_FAILED(result);
 
         nn::fs::FileInputStream fis;
 
         result = fis.TryInitialize(L"nver:/version.bin");
-        COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+        COMMON_LOGGER_RESULT_IF_FAILED(result);
         if (result.IsSuccess())
         {
             s64 fileSize = fis.GetSize();
@@ -93,7 +93,7 @@ void GetNupVersion(nn::pl::CTR::NetworkUpdateVersion* nup, nn::cfg::CTR::CfgRegi
             if (addr != NULL)
             {
                 result = fis.TryRead(&ret, addr, fileSize);
-                COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+                COMMON_LOGGER_RESULT_IF_FAILED(result);
                 if (result.IsSuccess())
                 {
                     nn::pl::CTR::NetworkUpdateVersion* ver_buf =
diff --git a/branches/1stNUP_for_2ndNUP/sources/common/version.h b/branches/1stNUP_for_2ndNUP/sources/common/version.h
index 2093ae3..a9901f3 100644
--- a/branches/1stNUP_for_2ndNUP/sources/common/version.h
+++ b/branches/1stNUP_for_2ndNUP/sources/common/version.h
@@ -18,5 +18,6 @@
 
 #define CONSOLE_REPAIR_VERSION_MAJOR    "1.5"
 #define CONSOLE_REPAIR_VERSION_MINOR    "1"
+#define CONSOLE_REPAIR_VERSION_MICRO    "2"
 
 #endif /* VERSION_H_ */
diff --git a/branches/1stNUP_for_2ndNUP/sources/tools/CmacAdder/main.cpp b/branches/1stNUP_for_2ndNUP/sources/tools/CmacAdder/main.cpp
index c8c1f4c..94a38f6 100644
--- a/branches/1stNUP_for_2ndNUP/sources/tools/CmacAdder/main.cpp
+++ b/branches/1stNUP_for_2ndNUP/sources/tools/CmacAdder/main.cpp
@@ -104,7 +104,7 @@ bool AddCmac(const wchar_t * from_path, void* buf, const size_t bufSize)
 
     if (result.IsFailure())
     {
-        COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+        COMMON_LOGGER_RESULT_IF_FAILED(result);
         return false;
     }
 
diff --git a/branches/1stNUP_for_2ndNUP/sources/tools/ExportedDataDecrypter/main.cpp b/branches/1stNUP_for_2ndNUP/sources/tools/ExportedDataDecrypter/main.cpp
index d07c99f..abe4dfb 100644
--- a/branches/1stNUP_for_2ndNUP/sources/tools/ExportedDataDecrypter/main.cpp
+++ b/branches/1stNUP_for_2ndNUP/sources/tools/ExportedDataDecrypter/main.cpp
@@ -162,7 +162,7 @@ bool CalculateAndCompareCmac(nn::crypto::Sha256Context* context, bit8* sdCmac)
     result = nn::crypto::CalculateAesCmacSw(cmac, sha256Hash, sizeof(sha256Hash), common::cmacKey);
     if (result.IsFailure())
     {
-        COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+        COMMON_LOGGER_RESULT_IF_FAILED(result);
         return false;
     }
 
@@ -201,7 +201,7 @@ bool DecryptDirectory(const wchar_t * from_path, const wchar_t* to_path, void* b
 
     if (result.IsFailure())
     {
-        COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+        COMMON_LOGGER_RESULT_IF_FAILED(result);
         return false;
     }
 
@@ -268,7 +268,7 @@ bool DecryptDirectory(const wchar_t * from_path, const wchar_t* to_path, void* b
             result = sdFile.TryGetSize(&sdFileSize);
             if (result.IsFailure())
             {
-                COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+                COMMON_LOGGER_RESULT_IF_FAILED(result);
                 ret_value = false;
                 break;
             }
@@ -292,13 +292,13 @@ bool DecryptDirectory(const wchar_t * from_path, const wchar_t* to_path, void* b
                     result = sdFile.TryRead(&readSize, sdCmac, sizeof(sdCmac));
                     if (result.IsFailure())
                     {
-                        COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+                        COMMON_LOGGER_RESULT_IF_FAILED(result);
                         return false;
                     }
                 }
                 else
                 {
-                    COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+                    COMMON_LOGGER_RESULT_IF_FAILED(result);
                     return false;
                 }
 
@@ -326,7 +326,7 @@ bool DecryptDirectory(const wchar_t * from_path, const wchar_t* to_path, void* b
                 std::memset(&enc, 0, sizeof(enc));
                 std::memset(&dec, 0, sizeof(dec));
                 sdFile.TryRead(&readSize, &enc, sizeof(enc));
-                COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+                COMMON_LOGGER_RESULT_IF_FAILED(result);
                 if(result.IsFailure())
                 {
                     ret_value = false;
@@ -343,7 +343,7 @@ bool DecryptDirectory(const wchar_t * from_path, const wchar_t* to_path, void* b
                 COMMON_LOGGER_RETURN_FALSE_IF_FAILED(result);
 
                 result = sdOutFile.TryInitialize(target_to.str().c_str(), true);
-                COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+                COMMON_LOGGER_RESULT_IF_FAILED(result);
 
                 while (1)
                 {
@@ -352,7 +352,7 @@ bool DecryptDirectory(const wchar_t * from_path, const wchar_t* to_path, void* b
 
                     if (result.IsFailure())
                     {
-                        COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+                        COMMON_LOGGER_RESULT_IF_FAILED(result);
                         ret_value = false;
                         break;
                     }
diff --git a/branches/1stNUP_for_2ndNUP/sources/tools/ExportedDataVerifier/main.cpp b/branches/1stNUP_for_2ndNUP/sources/tools/ExportedDataVerifier/main.cpp
index f2748da..e936ee0 100644
--- a/branches/1stNUP_for_2ndNUP/sources/tools/ExportedDataVerifier/main.cpp
+++ b/branches/1stNUP_for_2ndNUP/sources/tools/ExportedDataVerifier/main.cpp
@@ -149,7 +149,7 @@ bool CalculateAndCompareCmac(nn::crypto::Sha256Context* context, bit8* sdCmac)
     result = nn::crypto::CalculateAesCmacSw(cmac, sha256Hash, sizeof(sha256Hash), common::cmacKey);
     if (result.IsFailure())
     {
-        COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+        COMMON_LOGGER_RESULT_IF_FAILED(result);
         return false;
     }
 
@@ -187,7 +187,7 @@ bool VerifyDirectory(const wchar_t * from_path, void* buf,
 
     if (result.IsFailure())
     {
-        COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+        COMMON_LOGGER_RESULT_IF_FAILED(result);
         return false;
     }
 
@@ -239,7 +239,7 @@ bool VerifyDirectory(const wchar_t * from_path, void* buf,
             result = sdFile.TryGetSize(&sdFileSize);
             if (result.IsFailure())
             {
-                COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+                COMMON_LOGGER_RESULT_IF_FAILED(result);
                 ret_value = false;
                 break;
             }
@@ -263,13 +263,13 @@ bool VerifyDirectory(const wchar_t * from_path, void* buf,
                     result = sdFile.TryRead(&readSize, sdCmac, sizeof(sdCmac));
                     if (result.IsFailure())
                     {
-                        COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+                        COMMON_LOGGER_RESULT_IF_FAILED(result);
                         return false;
                     }
                 }
                 else
                 {
-                    COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+                    COMMON_LOGGER_RESULT_IF_FAILED(result);
                     return false;
                 }
 
@@ -297,7 +297,7 @@ bool VerifyDirectory(const wchar_t * from_path, void* buf,
                 std::memset(&enc, 0, sizeof(enc));
                 std::memset(&dec, 0, sizeof(dec));
                 sdFile.TryRead(&readSize, &enc, sizeof(enc));
-                COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+                COMMON_LOGGER_RESULT_IF_FAILED(result);
                 if(result.IsFailure())
                 {
                     ret_value = false;
@@ -314,7 +314,7 @@ bool VerifyDirectory(const wchar_t * from_path, void* buf,
 
                     if (result.IsFailure())
                     {
-                        COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+                        COMMON_LOGGER_RESULT_IF_FAILED(result);
                         ret_value = false;
                         break;
                     }
diff --git a/branches/1stNUP_for_2ndNUP/sources/tools/FatDataEncrypter/main.cpp b/branches/1stNUP_for_2ndNUP/sources/tools/FatDataEncrypter/main.cpp
index f09c8e1..20b97a3 100644
--- a/branches/1stNUP_for_2ndNUP/sources/tools/FatDataEncrypter/main.cpp
+++ b/branches/1stNUP_for_2ndNUP/sources/tools/FatDataEncrypter/main.cpp
@@ -158,7 +158,7 @@ bool EncryptDirectory(const wchar_t * from_path, void* buf,
 
     if (result.IsFailure())
     {
-        COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+        COMMON_LOGGER_RESULT_IF_FAILED(result);
         return false;
     }