From bbbb3258b2265d3f351f46792b50c17e36744da8 Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Tue, 1 Mar 2011 01:32:54 +0000
Subject: [PATCH] =?UTF-8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88=E8=BF=BD?=
 =?UTF-8?q?=E5=8A=A0=20Klockwork:=20=E7=AC=A6=E5=8F=B7=E3=81=AA=E3=81=97?=
 =?UTF-8?q?=E3=81=AE=E5=80=A4=E3=81=A8=200=20=E3=81=A8=E3=81=AE=E6=AF=94?=
 =?UTF-8?q?=E8=BC=83=E3=81=AF=E5=B8=B8=E3=81=AB=20true=20=E3=81=A8?=
 =?UTF-8?q?=E3=81=AA=E3=82=8A=E3=81=BE=E3=81=99.?=
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@95 385bec56-5757-e545-9c3a-d8741f4650f1
---
 trunk/ConsoleDataMigration/ConsoleBackup/Exporter.cpp | 2 +-
 trunk/ConsoleDataMigration/common/SimplePlayer.cpp    | 2 +-
 trunk/ConsoleDataMigration/common/common_Types.h      | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/trunk/ConsoleDataMigration/ConsoleBackup/Exporter.cpp b/trunk/ConsoleDataMigration/ConsoleBackup/Exporter.cpp
index 9979eed..69778bd 100644
--- a/trunk/ConsoleDataMigration/ConsoleBackup/Exporter.cpp
+++ b/trunk/ConsoleDataMigration/ConsoleBackup/Exporter.cpp
@@ -278,7 +278,7 @@ void GetSaveDataDirectoryRoot()
         for (s32 i = 6; i < 8; ++i)
         {
             bit32 n = (rootHash[k] >> ((7 - i) * 4)) & 0xf;
-            NN_TASSERT_(0 <= n && n < 16);
+            NN_TASSERT_(n < 16);
             rootStr[i - 6 + k * 2] = static_cast<char> (n < 10 ? '0' + n : 'a' + (n - 10));
         }
     }
diff --git a/trunk/ConsoleDataMigration/common/SimplePlayer.cpp b/trunk/ConsoleDataMigration/common/SimplePlayer.cpp
index 9753b92..97e8a76 100644
--- a/trunk/ConsoleDataMigration/common/SimplePlayer.cpp
+++ b/trunk/ConsoleDataMigration/common/SimplePlayer.cpp
@@ -183,7 +183,7 @@ void InitializeSimplePlayer()
 
 void PlaySound(u8 index)
 {
-    NN_ASSERT(0 <= index <= nFiles);
+    NN_ASSERT(index <= nFiles);
 
     while(!s_SoundThreadInitialized)
     {
diff --git a/trunk/ConsoleDataMigration/common/common_Types.h b/trunk/ConsoleDataMigration/common/common_Types.h
index 3190f25..9c7f50d 100644
--- a/trunk/ConsoleDataMigration/common/common_Types.h
+++ b/trunk/ConsoleDataMigration/common/common_Types.h
@@ -50,6 +50,7 @@ struct VerDef
     nn::pl::CTR::NetworkUpdateVersion   nup;
 };
 
+// TODO:リージョン追加時に範囲外アクセスにならないよう注意
 const nn::ProgramId     cCupVerId[] =
 {
     nn::pl::CTR::SHAREDDATA_TITLEID_CUP_VERSION_JP,