diff --git a/trunk/ConsoleDataMigration/sources/ConsoleBackup/ConsoleBackup.cpp b/trunk/ConsoleDataMigration/sources/ConsoleBackup/ConsoleBackup.cpp
index 8e9f88b..c24bf23 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleBackup/ConsoleBackup.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleBackup/ConsoleBackup.cpp
@@ -87,15 +87,15 @@ extern "C" void nnMain(void)
 
     // hid の初期化
     result = nn::hid::Initialize();
-    COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+    COMMON_LOGGER_RESULT_IF_FAILED(result);
 
     // ndmの初期化
     result = nn::ndm::Initialize();
-    COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+    COMMON_LOGGER_RESULT_IF_FAILED(result);
 
     // 全デーモンの自律動作をacの自動接続も含めて止める
     result = nn::ndm::SuspendScheduler();
-    COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+    COMMON_LOGGER_RESULT_IF_FAILED(result);
 
     // cfg の初期化
     nn::cfg::CTR::init::Initialize();
diff --git a/trunk/ConsoleDataMigration/sources/ConsoleBackup/Exporter.cpp b/trunk/ConsoleDataMigration/sources/ConsoleBackup/Exporter.cpp
index 56e6971..10cc890 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleBackup/Exporter.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleBackup/Exporter.cpp
@@ -504,7 +504,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);
@@ -863,7 +863,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;
     }
 
diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
index 7f30714..da15ad3 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
@@ -867,7 +867,7 @@ void ControlState(common::HardwareStateManager& manager, ::std::vector<std::stri
                 COMMON_LOGGER("Start Network Update\n");
                 // インポートコンテキストの削除
                 result = nn::am::DeleteAllImportContexts(nn::fs::MEDIA_TYPE_NAND);
-                COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+                COMMON_LOGGER_RESULT_IF_FAILED(result);
                 s_RestoreState = UPDATE_IN_PROGRESS;
             }
         }
@@ -1144,7 +1144,7 @@ void ControlState(common::HardwareStateManager& manager, ::std::vector<std::stri
         case READ_FILELIST:
         {
             result = SetupVersionAndFileList();
-            COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+            COMMON_LOGGER_RESULT_IF_FAILED(result);
 
             if (result.IsSuccess())
             {
diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp
index 4d16c89..4199d16 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp
@@ -525,7 +525,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())
                         {
@@ -1461,14 +1461,14 @@ bool ReadSetting(bool* nupOnly, bool* getIvs, bool* checkSd, bool* skipNup, bool
         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;
     }
 
@@ -1726,45 +1726,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/trunk/ConsoleDataMigration/sources/ConsoleRestore/NtpClient.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/NtpClient.cpp
index 885fc43..77b0e9a 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/NtpClient.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/NtpClient.cpp
@@ -63,7 +63,7 @@ bool GetNtpTime(u32* ntpTime)
 
     // 本体に書き込まれているネットワーク設定を使ってネットワーク接続を初期化
     result = common::InitializeNetwork();
-    COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+    COMMON_LOGGER_RESULT_IF_FAILED(result);
 
     {
         NN_LOG("Initializing socket..\n");
@@ -81,7 +81,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;
@@ -228,12 +228,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 = common::FinalizeNetwork();
-    COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+    COMMON_LOGGER_RESULT_IF_FAILED(result);
 
     return retval;
 }
diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Shop.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Shop.cpp
index d92c8a6..dc4443f 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Shop.cpp
+++ b/trunk/ConsoleDataMigration/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/trunk/ConsoleDataMigration/sources/ConsoleRestore/TitleDownloader.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/TitleDownloader.cpp
index d651b4f..1588d71 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/TitleDownloader.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/TitleDownloader.cpp
@@ -271,7 +271,7 @@ nn::Result ListUpTwlTitles(nn::ProgramId* list, size_t* num)
     {
         common::SdReaderWriter sdReader;
         result = sdReader.ReadBufWithCmac(common::TWL_TITLELIST_PATHNAME, titleListBuf, heapSize, &readSize);
-        COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+        COMMON_LOGGER_RESULT_IF_FAILED(result);
         if (result.IsSuccess())
         {
             u32 listHead = 0;
@@ -353,7 +353,7 @@ void TitleDownloader::Start()
         nn::nim::TitleConfig config;
         s64 requiredSize;
         m_Result = GetTitleConfig(m_ProgramIdList[i], &config, &requiredSize);
-        COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(m_Result);
+        COMMON_LOGGER_RESULT_IF_FAILED(m_Result);
 
         StartShopOperationSingle(SHOP_OPERATION_DOWNLOAD_TITLE, config);
         WaitShopOperationAndFinalize();
diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Updater.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Updater.cpp
index 44bc002..aa6b7cc 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Updater.cpp
+++ b/trunk/ConsoleDataMigration/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/trunk/ConsoleDataMigration/sources/common/CommonLogger.h b/trunk/ConsoleDataMigration/sources/common/CommonLogger.h
index eb83ff2..df19c6e 100644
--- a/trunk/ConsoleDataMigration/sources/common/CommonLogger.h
+++ b/trunk/ConsoleDataMigration/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/trunk/ConsoleDataMigration/sources/common/FileTransfer.cpp b/trunk/ConsoleDataMigration/sources/common/FileTransfer.cpp
index 00413fa..4bd981e 100644
--- a/trunk/ConsoleDataMigration/sources/common/FileTransfer.cpp
+++ b/trunk/ConsoleDataMigration/sources/common/FileTransfer.cpp
@@ -624,7 +624,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;
         }
@@ -647,7 +647,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;
                 }
@@ -687,7 +687,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/trunk/ConsoleDataMigration/sources/common/SaveDataMover.cpp b/trunk/ConsoleDataMigration/sources/common/SaveDataMover.cpp
index f16de94..b404822 100644
--- a/trunk/ConsoleDataMigration/sources/common/SaveDataMover.cpp
+++ b/trunk/ConsoleDataMigration/sources/common/SaveDataMover.cpp
@@ -188,7 +188,7 @@ void SaveDataMover::CalculateExportSystemSaveDataSize()
         if(m_Result.IsFailure())
         {
             COMMON_LOGGER_WARN("Can't Export: %08x\n", id);
-            COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(m_Result);
+            COMMON_LOGGER_RESULT_IF_FAILED(m_Result);
             continue;
         }
 
@@ -251,7 +251,7 @@ void SaveDataMover::ExportSystemSaveData(void* buf, size_t bufSize, u64* progres
         if(m_Result.IsFailure())
         {
             COMMON_LOGGER_WARN("Can't Export: %08x\n", id);
-            COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(m_Result);
+            COMMON_LOGGER_RESULT_IF_FAILED(m_Result);
             continue;
         }
         NN_LOG("fileSize = %lld\n", input.GetSize());
@@ -267,7 +267,7 @@ void SaveDataMover::ExportSystemSaveData(void* buf, size_t bufSize, u64* progres
             if(m_Result.IsFailure())
             {
                 COMMON_LOGGER_WARN("Can't Export: %08x\n", id);
-                COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(m_Result);
+                COMMON_LOGGER_RESULT_IF_FAILED(m_Result);
                 continue;
             }
 
@@ -278,7 +278,7 @@ void SaveDataMover::ExportSystemSaveData(void* buf, size_t bufSize, u64* progres
             if(m_Result.IsFailure())
             {
                 COMMON_LOGGER_WARN("Can't Export: %08x\n", id);
-                COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(m_Result);
+                COMMON_LOGGER_RESULT_IF_FAILED(m_Result);
                 continue;
             }
         }
@@ -391,7 +391,7 @@ void SaveDataMover::ImportSystemSaveData(void* buf, size_t bufSize, u64* progres
         if(m_Result.IsFailure())
         {
             COMMON_LOGGER_WARN("Can't Import: %08x\n", id);
-            COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(m_Result);
+            COMMON_LOGGER_RESULT_IF_FAILED(m_Result);
             continue;
         }
 
@@ -402,7 +402,7 @@ void SaveDataMover::ImportSystemSaveData(void* buf, size_t bufSize, u64* progres
         if(m_Result.IsFailure())
         {
             COMMON_LOGGER_WARN("Can't Import: %08x\n", id);
-            COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(m_Result);
+            COMMON_LOGGER_RESULT_IF_FAILED(m_Result);
             continue;
         }
 
@@ -414,7 +414,7 @@ void SaveDataMover::ImportSystemSaveData(void* buf, size_t bufSize, u64* progres
         if(m_Result.IsFailure())
         {
             COMMON_LOGGER_WARN("Can't Import: %08x\n", id);
-            COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(m_Result);
+            COMMON_LOGGER_RESULT_IF_FAILED(m_Result);
             continue;
         }
     }
diff --git a/trunk/ConsoleDataMigration/sources/common/Util.cpp b/trunk/ConsoleDataMigration/sources/common/Util.cpp
index a40f6ce..d76d141 100644
--- a/trunk/ConsoleDataMigration/sources/common/Util.cpp
+++ b/trunk/ConsoleDataMigration/sources/common/Util.cpp
@@ -70,7 +70,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;
@@ -92,13 +92,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();
@@ -113,9 +113,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()
@@ -376,13 +376,13 @@ nn::Result InitializeNetwork(void)
     nn::ac::Config config;
 
     result = nn::ac::InitializeInternal();
-    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;
     }
 
@@ -393,7 +393,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;
     }
 
@@ -409,7 +409,7 @@ nn::Result FinalizeNetwork(void)
     NN_UTIL_RETURN_IF_FAILED(result);
 
     result = nn::ac::FinalizeInternal();
-    COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+    COMMON_LOGGER_RESULT_IF_FAILED(result);
 
     return nn::ResultSuccess();
 }
diff --git a/trunk/ConsoleDataMigration/sources/common/VersionDetect.cpp b/trunk/ConsoleDataMigration/sources/common/VersionDetect.cpp
index d3e7b3b..052bc94 100644
--- a/trunk/ConsoleDataMigration/sources/common/VersionDetect.cpp
+++ b/trunk/ConsoleDataMigration/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/trunk/ConsoleDataMigration/sources/tools/CmacAdder/main.cpp b/trunk/ConsoleDataMigration/sources/tools/CmacAdder/main.cpp
index 07b5746..3d6e33a 100644
--- a/trunk/ConsoleDataMigration/sources/tools/CmacAdder/main.cpp
+++ b/trunk/ConsoleDataMigration/sources/tools/CmacAdder/main.cpp
@@ -105,7 +105,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;
     }
 
@@ -113,11 +113,11 @@ bool AddCmac(const wchar_t * from_path, void* buf, const size_t bufSize)
     const wchar_t* CMAC_DIR = L"CmacAdded";
     targetDirectory << from_path << CMAC_DIR;
     result = nn::fs::TryDeleteDirectoryRecursively(targetDirectory.str().c_str());
-    COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+    COMMON_LOGGER_RESULT_IF_FAILED(result);
     result = nn::fs::TryCreateDirectory(targetDirectory.str().c_str());
     if (result.IsFailure())
     {
-        COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+        COMMON_LOGGER_RESULT_IF_FAILED(result);
         return false;
     }
 
diff --git a/trunk/ConsoleDataMigration/sources/tools/ExportedDataDecrypter/main.cpp b/trunk/ConsoleDataMigration/sources/tools/ExportedDataDecrypter/main.cpp
index e235ba4..2a52c2c 100644
--- a/trunk/ConsoleDataMigration/sources/tools/ExportedDataDecrypter/main.cpp
+++ b/trunk/ConsoleDataMigration/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;
             }
@@ -291,13 +291,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;
                 }
 
@@ -325,7 +325,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;
@@ -342,7 +342,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)
                 {
@@ -351,7 +351,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/trunk/ConsoleDataMigration/sources/tools/ExportedDataVerifier/main.cpp b/trunk/ConsoleDataMigration/sources/tools/ExportedDataVerifier/main.cpp
index 824d415..c923fc5 100644
--- a/trunk/ConsoleDataMigration/sources/tools/ExportedDataVerifier/main.cpp
+++ b/trunk/ConsoleDataMigration/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;
             }
@@ -262,13 +262,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;
                 }
 
@@ -296,7 +296,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;
@@ -313,7 +313,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/trunk/ConsoleDataMigration/sources/tools/FatDataEncrypter/main.cpp b/trunk/ConsoleDataMigration/sources/tools/FatDataEncrypter/main.cpp
index d5c3f67..4e0263d 100644
--- a/trunk/ConsoleDataMigration/sources/tools/FatDataEncrypter/main.cpp
+++ b/trunk/ConsoleDataMigration/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;
     }