Change FB_NELEM return type to unsigned and resolve all FB_NELEM related Wsign-compare warnings

Artyom Abakumov · Artyom Abakumov · commit 0ae47e1936d3 · 2024-12-04T11:02:39.000+03:00
diff --git a/src/common/CvtFormat.cpp b/src/common/CvtFormat.cpp
@@ -1331,7 +1331,7 @@ namespace
 					bool isFound = false;
 
 					std::string_view monthShortName = getSubstringFromString(str, strLength, strOffset, 3);
-					for (int i = 0; i < FB_NELEM(FB_SHORT_MONTHS) - 1; i++)
+					for (FB_SIZE_T i = 0; i < FB_NELEM(FB_SHORT_MONTHS) - 1; i++)
 					{
 						if (std::equal(monthShortName.begin(), monthShortName.end(),
 								FB_SHORT_MONTHS[i], FB_SHORT_MONTHS[i] + strlen(FB_SHORT_MONTHS[i]),
@@ -1352,7 +1352,7 @@ namespace
 					bool isFound = false;
 
 					std::string_view monthFullName = getSubstringFromString(str, strLength, strOffset);
-					for (int i = 0; i < FB_NELEM(FB_LONG_MONTHS_UPPER) - 1; i++)
+					for (FB_SIZE_T i = 0; i < FB_NELEM(FB_LONG_MONTHS_UPPER) - 1; i++)
 					{
 						if (std::equal(monthFullName.begin(), monthFullName.end(),
 								FB_LONG_MONTHS_UPPER[i], FB_LONG_MONTHS_UPPER[i] + strlen(FB_LONG_MONTHS_UPPER[i]),
diff --git a/src/common/SimilarToRegex.cpp b/src/common/SimilarToRegex.cpp
@@ -410,7 +410,7 @@ namespace
 						if (!hasPatternChar() || getPatternChar() != ']')
 							status_exception::raise(Arg::Gds(isc_invalid_similar_pattern));
 
-						for (item.clazz = 0; item.clazz < FB_NELEM(classes); ++item.clazz)
+						for (item.clazz = 0; static_cast<FB_SIZE_T>(item.clazz) < FB_NELEM(classes); ++item.clazz)
 						{
 							if (fb_utils::strnicmp(patternStr + charSavePos,
 									classes[item.clazz].similarClass, len) == 0)
@@ -419,7 +419,7 @@ namespace
 							}
 						}
 
-						if (item.clazz >= FB_NELEM(classes))
+						if (static_cast<FB_SIZE_T>(item.clazz) >= FB_NELEM(classes))
 							status_exception::raise(Arg::Gds(isc_invalid_similar_pattern));
 					}
 					else
diff --git a/src/common/TextType.cpp b/src/common/TextType.cpp
@@ -153,7 +153,7 @@ TextType::TextType(TTYPE_ID _type, texttype *_tt, USHORT _attributes, CharSet* _
 			{'S', CHAR_UPPER_S}
 		};
 
-	for (int i = 0; i < FB_NELEM(conversions); i++)
+	for (FB_SIZE_T i = 0; i < FB_NELEM(conversions); i++)
 	{
 		try
 		{
diff --git a/src/common/classes/NoThrowTimeStamp.cpp b/src/common/classes/NoThrowTimeStamp.cpp
@@ -330,7 +330,7 @@ void NoThrowTimeStamp::round_time(ISC_TIME &ntime, const int precision)
 	if (scale <= 0)
 		return;
 
-	fb_assert(scale < FB_NELEM(POW_10_TABLE));
+	fb_assert(static_cast<FB_SIZE_T>(scale) < FB_NELEM(POW_10_TABLE));
 
 	const ISC_TIME period = POW_10_TABLE[scale];
 
diff --git a/src/common/pretty.cpp b/src/common/pretty.cpp
@@ -159,7 +159,7 @@ int PRETTY_print_cdb(const UCHAR* blr, FPTR_PRINT_CALLBACK routine, void* user_a
 	while (parameter = BLR_BYTE)
 	{
 		const char* p;
-		if (parameter > FB_NELEM(cdb_table) || !(p = cdb_table[parameter]))
+		if (parameter > static_cast<SSHORT>(FB_NELEM(cdb_table)) || !(p = cdb_table[parameter]))
 		{
 			return error(control, 0, "*** cdb parameter %d is undefined ***\n", parameter);
 		}
diff --git a/src/gpre/hsh.cpp b/src/gpre/hsh.cpp
@@ -38,7 +38,7 @@ static int hash(const SCHAR*);
 static bool scompare(const SCHAR*, const SCHAR*);
 static bool scompare2(const SCHAR*, const SCHAR*);
 
-const int HASH_SIZE = 211;
+const FB_SIZE_T HASH_SIZE = 211;
 
 static gpre_sym* hash_table[HASH_SIZE];
 static gpre_sym* key_symbols;
@@ -80,7 +80,7 @@ void HSH_init()
 {
 	//const char *string;
 
-	int i = 0;
+	FB_SIZE_T i = 0;
 	for (gpre_sym** ptr = hash_table; i < HASH_SIZE; i++)
 		*ptr++ = NULL;
 
diff --git a/src/include/fb_types.h b/src/include/fb_types.h
@@ -135,9 +135,9 @@ typedef int (*lock_ast_t)(void*);
 
 // Number of elements in an array
 template <typename T, std::size_t N>
-constexpr int FB_NELEM(const T (&)[N])
+constexpr FB_SIZE_T FB_NELEM(const T (&)[N])
 {
-	return N;
+	return static_cast<FB_SIZE_T>(N);
 }
 
 // Intl types
diff --git a/src/isql/isql.epp b/src/isql/isql.epp
@@ -904,7 +904,7 @@ int ISQL_main(int argc, char* argv[])
 			TEXT helpstring[158];
 			IUTILS_msg_get(USAGE, sizeof(helpstring), helpstring);
 			STDERROUT(helpstring);
-			for (int i = 0; i < FB_NELEM(isql_in_sw_table); i++)
+			for (FB_SIZE_T i = 0; i < FB_NELEM(isql_in_sw_table); i++)
 			{
 				if (isql_in_sw_table[i].in_sw_msg > 0)
 				{
@@ -5128,7 +5128,7 @@ static processing_state frontend(const TEXT* statement)
 	// Shift parms to upper case, leaving original case in lparms
 	typedef TEXT* isql_params_t[MAX_TERMS];
 	isql_params_t parms, lparms;
-	for (int iter = 0; iter < FB_NELEM(lparms); ++iter)
+	for (FB_SIZE_T iter = 0; iter < FB_NELEM(lparms); ++iter)
 	{
 		lparms[iter] = NULL;
 		parms[iter] = NULL;
diff --git a/src/isql/show.epp b/src/isql/show.epp
@@ -3752,7 +3752,7 @@ static processing_state show_dependencies(const char* object)
 
 	bool missing = true;
 
-	for (int i = 0; i < FB_NELEM(Object_types); ++i)
+	for (FB_SIZE_T i = 0; i < FB_NELEM(Object_types); ++i)
 	{
 		if (show_dependencies(object, i) == SKIP)
 		{
@@ -6709,4 +6709,4 @@ static processing_state show_wireStats()
 		return ps_ERR;
 
 	return SKIP;
-}
+}
diff --git a/src/jrd/Collation.cpp b/src/jrd/Collation.cpp
@@ -898,7 +898,7 @@ class SleuthMatcher
 			if (*control == *(CharType*) obj->getCanonicalChar(CHAR_GDML_SUBSTITUTE))
 			{
 				// Note: don't allow substitution characters larger than vector
-				CharType** const end_vector = vector + (((int) c < FB_NELEM(vector)) ? c : 0);
+				CharType** const end_vector = vector + ((static_cast<FB_SSIZE_T>(c) < static_cast<FB_SSIZE_T>(FB_NELEM(vector))) ? c : 0);
 				while (v <= end_vector)
 					*v++ = 0;
 				*end_vector = t;
diff --git a/src/jrd/SysFunction.cpp b/src/jrd/SysFunction.cpp
@@ -62,6 +62,7 @@
 #include "../common/classes/FpeControl.h"
 #include "../jrd/extds/ExtDS.h"
 #include "../jrd/align.h"
+#include "firebird/impl/types_pub.h"
 
 #include <functional>
 #include <cmath>
@@ -2709,7 +2710,7 @@ const char* extractParts[] =
 
 const char* getPartName(int n)
 {
-	if (n < 0 || n >= FB_NELEM(extractParts) || !extractParts[n])
+	if (n < 0 || static_cast<FB_SIZE_T>(n) >= FB_NELEM(extractParts) || !extractParts[n])
 		return "Unknown";
 
 	return extractParts[n];
diff --git a/src/jrd/blob_filter.cpp b/src/jrd/blob_filter.cpp
@@ -239,7 +239,7 @@ BlobFilter* BLF_lookup_internal_filter(thread_db* tdbb, SSHORT from, SSHORT to)
 
 	// Check for system defined filter
 
-	if (to == isc_blob_text && from >= 0 && from < FB_NELEM(filters))
+	if (to == isc_blob_text && from >= 0 && static_cast<FB_SIZE_T>(from) < FB_NELEM(filters))
 	{
 		BlobFilter* result = FB_NEW_POOL(*dbb->dbb_permanent) BlobFilter(*dbb->dbb_permanent);
 		result->blf_next = NULL;
diff --git a/src/jrd/extds/InternalDS.cpp b/src/jrd/extds/InternalDS.cpp
@@ -171,7 +171,7 @@ void InternalConnection::attach(thread_db* tdbb)
 
 	memset(m_features, false, sizeof(m_features));
 	static const info_features features[] = ENGINE_FEATURES;
-	for (int i = 0; i < FB_NELEM(features); i++)
+	for (FB_SIZE_T i = 0; i < FB_NELEM(features); i++)
 		setFeature(features[i]);
 }
 
diff --git a/src/jrd/filters.cpp b/src/jrd/filters.cpp
@@ -811,7 +811,7 @@ ISC_STATUS filter_transliterate_text(USHORT action, BlobControl* control)
 	{
 	case isc_blob_filter_open:
 	case isc_blob_filter_create:
-		for (SSHORT i = 0; i < FB_NELEM(control->ctl_data); i++)
+		for (USHORT i = 0; i < FB_NELEM(control->ctl_data); i++)
 			control->ctl_data[i] = 0;
 		aux = NULL;
 
diff --git a/src/jrd/ini.epp b/src/jrd/ini.epp
@@ -1619,7 +1619,7 @@ static void store_indices(thread_db* tdbb, USHORT odsVersion)
 
 	AutoRequest handle1, handle2, handle3;
 
-	for (int n = 0; n < SYSTEM_INDEX_COUNT; n++)
+	for (FB_SIZE_T n = 0; n < SYSTEM_INDEX_COUNT; n++)
 	{
 		const ini_idx_t* index = &indices[n];
 		const auto relation = MET_relation(tdbb, index->ini_idx_relid);
diff --git a/src/jrd/par.cpp b/src/jrd/par.cpp
@@ -1519,7 +1519,7 @@ DmlNode* PAR_parse_node(thread_db* tdbb, CompilerScratch* csb)
 	const ULONG blrOffset = csb->csb_blr_reader.getOffset();
 	const SSHORT blrOperator = csb->csb_blr_reader.getByte();
 
-	if (blrOperator < 0 || blrOperator >= FB_NELEM(blr_parsers))
+	if (blrOperator < 0 || static_cast<USHORT>(blrOperator) >= FB_NELEM(blr_parsers))
 	{
         // NS: This error string is correct, please do not mangle it again and again.
 		// The whole error message is "BLR syntax error: expected %s at offset %d, encountered %d"
diff --git a/src/yvalve/alt.cpp b/src/yvalve/alt.cpp
@@ -250,7 +250,7 @@ ISC_STATUS API_ROUTINE_VARARG gds__start_transaction(ISC_STATUS* status_vector,
 	teb_t tebs[16];
 	teb_t* teb = tebs;
 
-	if (count > FB_NELEM(tebs))
+	if (static_cast<FB_SIZE_T>(count) > FB_NELEM(tebs))
 		teb = (teb_t*) gds__alloc(((SLONG) sizeof(teb_t) * count));
 	// FREE: later in this module
 
diff --git a/src/yvalve/gds.cpp b/src/yvalve/gds.cpp
@@ -4025,7 +4025,7 @@ static void blr_print_verb(gds_ctl* control, SSHORT level)
 					case blr_invoke_function_type:
 						n = control->ctl_blr_reader.getByte();
 
-						if (n == 0 || n >= FB_NELEM(typeSubCodes))
+						if (n == 0 || n >= static_cast<SSHORT>(FB_NELEM(typeSubCodes)))
 							blr_error(control, "*** invalid blr_invoke_function_type sub code ***");
 
 						blr_format(control, "blr_invoke_function_type_%s,", typeSubCodes[n]);
@@ -4123,7 +4123,7 @@ static void blr_print_verb(gds_ctl* control, SSHORT level)
 					case blr_invsel_procedure_type:
 						n = control->ctl_blr_reader.getByte();
 
-						if (n == 0 || n >= FB_NELEM(typeSubCodes))
+						if (n == 0 || n >= static_cast<SSHORT>(FB_NELEM(typeSubCodes)))
 							blr_error(control, "*** invalid blr_invsel_procedure_type sub code ***");
 
 						blr_format(control, "blr_invsel_procedure_type_%s,", typeSubCodes[n]);

Original file line number	Diff line number	Diff line change
`@@ -410,7 +410,7 @@ namespace`
`410`	`410`	`if (!hasPatternChar() \|\| getPatternChar() != ']')`
`411`	`411`	`status_exception::raise(Arg::Gds(isc_invalid_similar_pattern));`
`412`	`412`
`413`		`- for (item.clazz = 0; item.clazz < FB_NELEM(classes); ++item.clazz)`
	`413`	`+ for (item.clazz = 0; static_cast<FB_SIZE_T>(item.clazz) < FB_NELEM(classes); ++item.clazz)`
`414`	`414`	`{`
`415`	`415`	`if (fb_utils::strnicmp(patternStr + charSavePos,`
`416`	`416`	`classes[item.clazz].similarClass, len) == 0)`
`@@ -419,7 +419,7 @@ namespace`
`419`	`419`	`}`
`420`	`420`	`}`
`421`	`421`
`422`		`- if (item.clazz >= FB_NELEM(classes))`
	`422`	`+ if (static_cast<FB_SIZE_T>(item.clazz) >= FB_NELEM(classes))`
`423`	`423`	`status_exception::raise(Arg::Gds(isc_invalid_similar_pattern));`
`424`	`424`	`}`
`425`	`425`	`else`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ TextType::TextType(TTYPE_ID _type, texttype _tt, USHORT _attributes, CharSet _`
`153`	`153`	`{'S', CHAR_UPPER_S}`
`154`	`154`	`};`
`155`	`155`
`156`		`- for (int i = 0; i < FB_NELEM(conversions); i++)`
	`156`	`+ for (FB_SIZE_T i = 0; i < FB_NELEM(conversions); i++)`
`157`	`157`	`{`
`158`	`158`	`try`
`159`	`159`	`{`
Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ int PRETTY_print_cdb(const UCHAR* blr, FPTR_PRINT_CALLBACK routine, void* user_a`
`159`	`159`	`while (parameter = BLR_BYTE)`
`160`	`160`	`{`
`161`	`161`	`const char* p;`
`162`		`- if (parameter > FB_NELEM(cdb_table) \|\| !(p = cdb_table[parameter]))`
	`162`	`+ if (parameter > static_cast<SSHORT>(FB_NELEM(cdb_table)) \|\| !(p = cdb_table[parameter]))`
`163`	`163`	`{`
`164`	`164`	`return error(control, 0, "* cdb parameter %d is undefined *\n", parameter);`
`165`	`165`	`}`
Original file line number	Diff line number	Diff line change
`@@ -135,9 +135,9 @@ typedef int (lock_ast_t)(void);`
`135`	`135`
`136`	`136`	`// Number of elements in an array`
`137`	`137`	`template <typename T, std::size_t N>`
`138`		`-constexpr int FB_NELEM(const T (&)[N])`
	`138`	`+constexpr FB_SIZE_T FB_NELEM(const T (&)[N])`
`139`	`139`	`{`
`140`		`- return N;`
	`140`	`+ return static_cast<FB_SIZE_T>(N);`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`// Intl types`
Original file line number	Diff line number	Diff line change
`@@ -904,7 +904,7 @@ int ISQL_main(int argc, char* argv[])`
`904`	`904`	`TEXT helpstring[158];`
`905`	`905`	`IUTILS_msg_get(USAGE, sizeof(helpstring), helpstring);`
`906`	`906`	`STDERROUT(helpstring);`
`907`		`- for (int i = 0; i < FB_NELEM(isql_in_sw_table); i++)`
	`907`	`+ for (FB_SIZE_T i = 0; i < FB_NELEM(isql_in_sw_table); i++)`
`908`	`908`	`{`
`909`	`909`	`if (isql_in_sw_table[i].in_sw_msg > 0)`
`910`	`910`	`{`
`@@ -5128,7 +5128,7 @@ static processing_state frontend(const TEXT* statement)`
`5128`	`5128`	`// Shift parms to upper case, leaving original case in lparms`
`5129`	`5129`	`typedef TEXT* isql_params_t[MAX_TERMS];`
`5130`	`5130`	`isql_params_t parms, lparms;`
`5131`		`- for (int iter = 0; iter < FB_NELEM(lparms); ++iter)`
	`5131`	`+ for (FB_SIZE_T iter = 0; iter < FB_NELEM(lparms); ++iter)`
`5132`	`5132`	`{`
`5133`	`5133`	`lparms[iter] = NULL;`
`5134`	`5134`	`parms[iter] = NULL;`
Original file line number	Diff line number	Diff line change
`@@ -3752,7 +3752,7 @@ static processing_state show_dependencies(const char* object)`
`3752`	`3752`
`3753`	`3753`	`bool missing = true;`
`3754`	`3754`
`3755`		`- for (int i = 0; i < FB_NELEM(Object_types); ++i)`
	`3755`	`+ for (FB_SIZE_T i = 0; i < FB_NELEM(Object_types); ++i)`
`3756`	`3756`	`{`
`3757`	`3757`	`if (show_dependencies(object, i) == SKIP)`
`3758`	`3758`	`{`
`@@ -6709,4 +6709,4 @@ static processing_state show_wireStats()`
`6709`	`6709`	`return ps_ERR;`
`6710`	`6710`
`6711`	`6711`	`return SKIP;`
`6712`		`-}`
	`6712`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -898,7 +898,7 @@ class SleuthMatcher`
`898`	`898`	`if (control == (CharType*) obj->getCanonicalChar(CHAR_GDML_SUBSTITUTE))`
`899`	`899`	`{`
`900`	`900`	`// Note: don't allow substitution characters larger than vector`
`901`		`- CharType** const end_vector = vector + (((int) c < FB_NELEM(vector)) ? c : 0);`
	`901`	`+ CharType** const end_vector = vector + ((static_cast<FB_SSIZE_T>(c) < static_cast<FB_SSIZE_T>(FB_NELEM(vector))) ? c : 0);`
`902`	`902`	`while (v <= end_vector)`
`903`	`903`	`*v++ = 0;`
`904`	`904`	`*end_vector = t;`