From 72a951dd257e53d5cda732651e5f93638e2a20c5 Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Mon, 11 Jul 2011 09:31:34 +0000
Subject: [PATCH] =?UTF-8?q?MAC=E6=A4=9C=E8=A8=BC=E5=A4=B1=E6=95=97?=
 =?UTF-8?q?=E6=99=82=E3=81=ABfalse=E3=82=92=E8=BF=94=E3=81=99=E3=82=88?=
 =?UTF-8?q?=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@376 385bec56-5757-e545-9c3a-d8741f4650f1
---
 trunk/ConsoleDataMigration/sources/common/CommonLogger.h   | 4 ++++
 trunk/ConsoleDataMigration/sources/common/FileTransfer.cpp | 1 +
 2 files changed, 5 insertions(+)

diff --git a/trunk/ConsoleDataMigration/sources/common/CommonLogger.h b/trunk/ConsoleDataMigration/sources/common/CommonLogger.h
index 6cabc1c..4c0ae93 100644
--- a/trunk/ConsoleDataMigration/sources/common/CommonLogger.h
+++ b/trunk/ConsoleDataMigration/sources/common/CommonLogger.h
@@ -93,6 +93,10 @@
         return;                                                     \
     }                                                                \
 
+#define COMMON_LOGGER_RETURN_FALSE(result) \
+    COMMON_LOGGER_RESULT_WITH_LINE(result, __LINE__, __func__);  \
+    return false;                                               \
+
 namespace common
 {
 
diff --git a/trunk/ConsoleDataMigration/sources/common/FileTransfer.cpp b/trunk/ConsoleDataMigration/sources/common/FileTransfer.cpp
index 16bea31..cc76f83 100644
--- a/trunk/ConsoleDataMigration/sources/common/FileTransfer.cpp
+++ b/trunk/ConsoleDataMigration/sources/common/FileTransfer.cpp
@@ -674,6 +674,7 @@ bool ConfirmFile(nn::fs::FileInputStream* from_file, nn::fs::FileStream* to_file
         COMMON_LOGGER("**********Verification Failed %s, Delete**********\n", GetCharStr(sdPath));
         result = nn::fs::TryDeleteFile(tmpPath);
         COMMON_LOGGER_RETURN_FALSE_IF_FAILED(result);
+        return false;
     }
     else
     {