Cut-over to COUNTOF in source files

git-svn-id: svn://svn.code.sf.net/p/cryptopp/code/trunk/c5@570 57ff6487-cd31-0410-9ec3-f628ee90f5f0

5 files changed, 18 insertions, 18 deletions

diff --git a/eccrypto.cpp b/eccrypto.cpp
index dfff26e..5ea4e3a 100644
--- a/eccrypto.cpp
+++ b/eccrypto.cpp
@@ -249,7 +249,7 @@ static void GetRecommendedParameters(const EcRecommendedParameters<EC2N> *&begin
 			2),
 	};
 	begin = rec;
-	end = rec + sizeof(rec)/sizeof(rec[0]);
+	end = rec + COUNTOF(rec);
 }
 
 static void GetRecommendedParameters(const EcRecommendedParameters<ECP> *&begin, const EcRecommendedParameters<ECP> *&end)
@@ -412,7 +412,7 @@ static void GetRecommendedParameters(const EcRecommendedParameters<ECP> *&begin,
 			1),
 	};
 	begin = rec;
-	end = rec + sizeof(rec)/sizeof(rec[0]);
+	end = rec + COUNTOF(rec);
 }
 
 template <class EC> OID DL_GroupParameters_EC<EC>::GetNextRecommendedParametersOID(const OID &oid)
diff --git a/fipsalgt.cpp b/fipsalgt.cpp
index 92c254f..46ab0e0 100644
--- a/fipsalgt.cpp
+++ b/fipsalgt.cpp
@@ -1218,7 +1218,7 @@ int FIPS_140_AlgorithmTest(int argc, char **argv)
 	if (algorithm == "auto")
 	{
 		string algTable[] = {"AES", "ECDSA", "DSA", "HMAC", "RNG", "RSA", "TDES", "SKIPJACK", "SHA"};	// order is important here
-		for (i=0; i<sizeof(algTable)/sizeof(algTable[0]); i++)
+		for (i=0; i<COUNTOF(algTable); i++)
 		{
 			if (dirname.find(algTable[i]) != std::string::npos)
 			{
diff --git a/fipstest.cpp b/fipstest.cpp
index edb75dc..20bc8c8 100644
--- a/fipstest.cpp
+++ b/fipstest.cpp
@@ -346,7 +346,7 @@ bool IntegrityCheckModule(const char *moduleFilename, const byte *expectedModule
 				nextSubSectionStart = 0;
 
 				unsigned int entriesToReadFromDisk[] = {IMAGE_DIRECTORY_ENTRY_IMPORT, IMAGE_DIRECTORY_ENTRY_IAT};
-				for (unsigned int i=0; i<sizeof(entriesToReadFromDisk)/sizeof(entriesToReadFromDisk[0]); i++)
+				for (unsigned int i=0; i<COUNTOF(entriesToReadFromDisk); i++)
 				{
 					const IMAGE_DATA_DIRECTORY &entry = phnt->OptionalHeader.DataDirectory[entriesToReadFromDisk[i]];
 					const byte *entryMemStart = memBase + entry.VirtualAddress;
diff --git a/hrtimer.cpp b/hrtimer.cpp
index 906ec4a..cd268bf 100644
--- a/hrtimer.cpp
+++ b/hrtimer.cpp
@@ -24,7 +24,7 @@ double TimerBase::ConvertTo(TimerWord t, Unit unit)
 {
 	static unsigned long unitsPerSecondTable[] = {1, 1000, 1000*1000, 1000*1000*1000};
 
-	assert(unit < sizeof(unitsPerSecondTable) / sizeof(unitsPerSecondTable[0]));
+	assert(unit < COUNTOF(unitsPerSecondTable));
 	return (double)CRYPTOPP_VC6_INT64 t * unitsPerSecondTable[unit] / CRYPTOPP_VC6_INT64 TicksPerSecond();
 }
 
diff --git a/validat3.cpp b/validat3.cpp
index 07b6334..523606d 100644
--- a/validat3.cpp
+++ b/validat3.cpp
@@ -87,7 +87,7 @@ bool ValidateCRC32()
 	CRC32 crc;
 
 	cout << "\nCRC-32 validation suite running...\n\n";
-	return HashModuleTest(crc, testSet, sizeof(testSet)/sizeof(testSet[0]));
+	return HashModuleTest(crc, testSet, COUNTOF(testSet));
 }
 
 bool ValidateAdler32()
@@ -106,7 +106,7 @@ bool ValidateAdler32()
 	Adler32 md;
 
 	cout << "\nAdler-32 validation suite running...\n\n";
-	return HashModuleTest(md, testSet, sizeof(testSet)/sizeof(testSet[0]));
+	return HashModuleTest(md, testSet, COUNTOF(testSet));
 }
 
 bool ValidateMD2()
@@ -125,7 +125,7 @@ bool ValidateMD2()
 	Weak::MD2 md2;
 
 	cout << "\nMD2 validation suite running...\n\n";
-	return HashModuleTest(md2, testSet, sizeof(testSet)/sizeof(testSet[0]));
+	return HashModuleTest(md2, testSet, COUNTOF(testSet));
 }
 
 bool ValidateMD4()
@@ -144,7 +144,7 @@ bool ValidateMD4()
 	Weak::MD4 md4;
 
 	cout << "\nMD4 validation suite running...\n\n";
-	return HashModuleTest(md4, testSet, sizeof(testSet)/sizeof(testSet[0]));
+	return HashModuleTest(md4, testSet, COUNTOF(testSet));
 }
 
 bool ValidateMD5()
@@ -163,7 +163,7 @@ bool ValidateMD5()
 	Weak::MD5 md5;
 
 	cout << "\nMD5 validation suite running...\n\n";
-	return HashModuleTest(md5, testSet, sizeof(testSet)/sizeof(testSet[0]));
+	return HashModuleTest(md5, testSet, COUNTOF(testSet));
 }
 
 bool ValidateSHA()
@@ -197,7 +197,7 @@ bool ValidateTiger()
 
 	Tiger tiger;
 
-	return HashModuleTest(tiger, testSet, sizeof(testSet)/sizeof(testSet[0]));
+	return HashModuleTest(tiger, testSet, COUNTOF(testSet));
 }
 
 bool ValidateRIPEMD()
@@ -258,19 +258,19 @@ bool ValidateRIPEMD()
 
 	cout << "\nRIPEMD-128 validation suite running...\n\n";
 	RIPEMD128 md128;
-	pass = HashModuleTest(md128, testSet128, sizeof(testSet128)/sizeof(testSet128[0])) && pass;
+	pass = HashModuleTest(md128, testSet128, COUNTOF(testSet128)) && pass;
 
 	cout << "\nRIPEMD-160 validation suite running...\n\n";
 	RIPEMD160 md160;
-	pass = HashModuleTest(md160, testSet160, sizeof(testSet160)/sizeof(testSet160[0])) && pass;
+	pass = HashModuleTest(md160, testSet160, COUNTOF(testSet160)) && pass;
 
 	cout << "\nRIPEMD-256 validation suite running...\n\n";
 	RIPEMD256 md256;
-	pass = HashModuleTest(md256, testSet256, sizeof(testSet256)/sizeof(testSet256[0])) && pass;
+	pass = HashModuleTest(md256, testSet256, COUNTOF(testSet256)) && pass;
 
 	cout << "\nRIPEMD-320 validation suite running...\n\n";
 	RIPEMD320 md320;
-	pass = HashModuleTest(md320, testSet320, sizeof(testSet320)/sizeof(testSet320[0])) && pass;
+	pass = HashModuleTest(md320, testSet320, COUNTOF(testSet320)) && pass;
 
 	return pass;
 }
@@ -495,7 +495,7 @@ bool ValidateTTMAC()
 	cout << "\nTwo-Track-MAC validation suite running...\n";
 
 	TTMAC mac(key, sizeof(key));
-	for (size_t k=0; k<sizeof(TestVals)/sizeof(TestVals[0]); k++)
+	for (size_t k=0; k<COUNTOF(TestVals); k++)
 	{
 		mac.Update((byte *)TestVals[k], strlen(TestVals[k]));
 		mac.Final(digest);
@@ -571,7 +571,7 @@ bool ValidatePBKDF()
 	PKCS12_PBKDF<SHA1> pbkdf;
 
 	cout << "\nPKCS #12 PBKDF validation suite running...\n\n";
-	pass = TestPBKDF(pbkdf, testSet, sizeof(testSet)/sizeof(testSet[0])) && pass;
+	pass = TestPBKDF(pbkdf, testSet, COUNTOF(testSet)) && pass;
 	}
 
 	{
@@ -585,7 +585,7 @@ bool ValidatePBKDF()
 	PKCS5_PBKDF2_HMAC<SHA1> pbkdf;
 
 	cout << "\nPKCS #5 PBKDF2 validation suite running...\n\n";
-	pass = TestPBKDF(pbkdf, testSet, sizeof(testSet)/sizeof(testSet[0])) && pass;
+	pass = TestPBKDF(pbkdf, testSet, COUNTOF(testSet)) && pass;
 	}
 
 	return pass;