マジックナンバーの除去とインデント調整

git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_Repair@564 385bec56-5757-e545-9c3a-d8741f4650f1
This commit is contained in:
N2614 2012-01-18 04:40:32 +00:00
parent a5045a5376
commit f5c1b8b781

View File

@ -6,17 +6,18 @@
namespace
{
const wchar_t dash[] = {0x2014, 0x0000};
const wchar_t dash[] =
{ 0x2014, 0x0000 };
}
class RegionIdModifierId : public RegionIdModifier
class RegionIdModifierId: public RegionIdModifier
{
public:
RegionIdModifierId(u16 id);
};
RegionIdModifierId::RegionIdModifierId(u16 id) : RegionIdModifier(id, 0, 0, NULL)
RegionIdModifierId::RegionIdModifierId(u16 id) :
RegionIdModifier(id, 0, 0, NULL)
{
}
@ -44,17 +45,18 @@ TEST(testRegionIdModifier, IsValid)
}
}
class RegionIdModifierDirPath : public RegionIdModifier
class RegionIdModifierDirPath: public RegionIdModifier
{
public:
RegionIdModifierDirPath(u8 nupVersion, u8 regionCode);
const wchar_t* GetPath(u8 index);
private:
PathList m_DirPath[3];
PathList m_DirPath[nn::cfg::CTR::CFG_REGION_EUROPE + 1];
};
RegionIdModifierDirPath::RegionIdModifierDirPath(u8 nupVersion, u8 regionCode) : RegionIdModifier(0, nupVersion, regionCode, NULL)
RegionIdModifierDirPath::RegionIdModifierDirPath(u8 nupVersion, u8 regionCode) :
RegionIdModifier(0, nupVersion, regionCode, NULL)
{
}
@ -195,13 +197,14 @@ TEST(testRegionIdModifier, GetDirectoryPath)
}
class RegionIdModifierPathNum : public RegionIdModifier
class RegionIdModifierPathNum: public RegionIdModifier
{
public:
RegionIdModifierPathNum(u8 nupVersion);
};
RegionIdModifierPathNum::RegionIdModifierPathNum(u8 nupVersion) : RegionIdModifier(0, nupVersion, 0, NULL)
RegionIdModifierPathNum::RegionIdModifierPathNum(u8 nupVersion) :
RegionIdModifier(0, nupVersion, 0, NULL)
{
}
@ -270,17 +273,18 @@ TEST(testRegionIdModifier, GetFileName)
}
}
class RegionIdModifierFilePath : public RegionIdModifier
class RegionIdModifierFilePath: public RegionIdModifier
{
public:
RegionIdModifierFilePath(u16 id, u8 nupVersion, u8 regionCode);
const wchar_t* GetPath(u8 index);
private:
PathList m_FilePath[3];
PathList m_FilePath[nn::cfg::CTR::CFG_REGION_EUROPE + 1];
};
RegionIdModifierFilePath::RegionIdModifierFilePath(u16 id, u8 nupVersion, u8 regionCode) : RegionIdModifier(id, nupVersion, regionCode, NULL)
RegionIdModifierFilePath::RegionIdModifierFilePath(u16 id, u8 nupVersion, u8 regionCode) :
RegionIdModifier(id, nupVersion, regionCode, NULL)
{
}
@ -300,29 +304,31 @@ TEST(testRegionIdModifier, GetFilePath)
ASSERT_STREQ(rim.GetPath(0), L"0/JP/1_LZ.bin");
}
{
RegionIdModifierFilePath rim(185 << 8 ,5, 2);
RegionIdModifierFilePath rim(185 << 8, 5, 2);
ASSERT_STREQ(rim.GetPath(0), L"0/EU/185_LZ.bin");
ASSERT_STREQ(rim.GetPath(1), L"2/EU/185_LZ.bin");
ASSERT_STREQ(rim.GetPath(2), L"5/EU/185_LZ.bin");
}
// 範囲外
{
RegionIdModifierFilePath rim(0xff00 ,6, 3);
RegionIdModifierFilePath rim(0xff00, 6, 3);
ASSERT_STREQ(rim.GetPath(0), L"");
}
}
class RegionIdModifierGetValidRegionId : public RegionIdModifier
class RegionIdModifierGetValidRegionId: public RegionIdModifier
{
public:
RegionIdModifierGetValidRegionId(u16 id, u8 nupVersion, u8 regionCode, const wchar_t* regionName);
const wchar_t* GetPath(u8 index);
private:
PathList m_FilePath[3];
PathList m_FilePath[nn::cfg::CTR::CFG_REGION_EUROPE + 1];
};
RegionIdModifierGetValidRegionId::RegionIdModifierGetValidRegionId(u16 id, u8 nupVersion, u8 regionCode, const wchar_t* regionName) : RegionIdModifier(id, nupVersion, regionCode, regionName)
RegionIdModifierGetValidRegionId::RegionIdModifierGetValidRegionId(u16 id, u8 nupVersion, u8 regionCode,
const wchar_t* regionName) :
RegionIdModifier(id, nupVersion, regionCode, regionName)
{
}
@ -345,12 +351,12 @@ void GetValidRegionIdHelper(u16 id, u8 nupVersion, u8 regionCode, const wchar_t*
RegionIdModifierGetValidRegionId rim(id, nupVersion, regionCode, regionName);
fileNum = rim.GetFilePathNum();
for(u8 i = 0 ; i < fileNum; i++)
for (u8 i = 0; i < fileNum; i++)
{
ReadFile(rim.GetPath(fileNum - i - 1), &buf, &size);
if(rim.GetValidRegionId(buf, size, &modifiedId))
if (rim.GetValidRegionId(buf, size, &modifiedId))
{
if(modifiedId == expectedId)
if (modifiedId == expectedId)
{
ASSERT_TRUE(rim.GetValidRegionId(buf, size, &modifiedId));
ASSERT_EQ(modifiedId, expectedId);
@ -398,7 +404,7 @@ TEST(testRegionIdModifier, GetValidRegionIdLaunch)
{
u8 nupVersion;
for(u8 i = 0; i < 6; i++)
for (u8 i = 0; i < 6; i++)
{
nupVersion = i;
#include "testdata_Launch_all_valid.txt"
@ -410,7 +416,7 @@ TEST(testRegionIdModifier, GetValidRegionId1stNUP)
{
u8 nupVersion;
for(u8 i = 2; i < 6; i++)
for (u8 i = 2; i < 6; i++)
{
nupVersion = i;
#include "testdata_1stNUP_all_valid.txt"
@ -421,7 +427,7 @@ TEST(testRegionIdModifier, GetValidRegionId1stNUP)
TEST(testRegionIdModifier, GetValidRegionId2ndNUP)
{
u8 nupVersion;
for(u8 i = 5; i < 6; i++)
for (u8 i = 5; i < 6; i++)
{
nupVersion = i;
#include "testdata_2ndNUP_all_valid.txt"