From 865498024e92e179add56252aafa9e40923580af Mon Sep 17 00:00:00 2001 From: N2614 Date: Mon, 26 Mar 2012 06:22:35 +0000 Subject: [PATCH] =?UTF-8?q?=E7=84=A1=E8=A6=96=E3=81=99=E3=82=8B=E3=81=B9?= =?UTF-8?q?=E3=81=8DResult=E3=82=92=E3=81=9D=E3=81=AE=E3=81=BE=E3=81=BE?= =?UTF-8?q?=E8=BF=94=E3=81=97=E3=81=A6=E3=81=84=E3=81=9F=E3=81=AE=E3=81=A7?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= 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@678 385bec56-5757-e545-9c3a-d8741f4650f1 --- .../sources/ConsoleBackup/SavedataChecker.cpp | 2 +- branches/1stNUP_for_2ndNUP/sources/common/FileTransfer.cpp | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/branches/1stNUP_for_2ndNUP/sources/ConsoleBackup/SavedataChecker.cpp b/branches/1stNUP_for_2ndNUP/sources/ConsoleBackup/SavedataChecker.cpp index c96bd93..ad08c7e 100644 --- a/branches/1stNUP_for_2ndNUP/sources/ConsoleBackup/SavedataChecker.cpp +++ b/branches/1stNUP_for_2ndNUP/sources/ConsoleBackup/SavedataChecker.cpp @@ -370,7 +370,7 @@ nn::Result SystemSavedataChecker::CalculateFileSize() } NN_LOG("CalculatedFileSize = %lld\n", m_CalculatedFileSize); - return result; + return nn::ResultSuccess(); } SharedExtSavedataChecker::SharedExtSavedataChecker() diff --git a/branches/1stNUP_for_2ndNUP/sources/common/FileTransfer.cpp b/branches/1stNUP_for_2ndNUP/sources/common/FileTransfer.cpp index ecb212d..291fac6 100644 --- a/branches/1stNUP_for_2ndNUP/sources/common/FileTransfer.cpp +++ b/branches/1stNUP_for_2ndNUP/sources/common/FileTransfer.cpp @@ -776,10 +776,7 @@ nn::Result CalculateFileSizeRecursively(std::wstring currentDirectory, s64& file NN_LOG("%s\n", common::GetCharStr(currentDirectory.c_str())); result = dir.TryInitialize(currentDirectory.c_str()); - if(result.IsFailure()) - { - return result; - } + COMMON_LOGGER_RETURN_RESULT_IF_FAILED(result); for (;;) {