Merge remote-tracking branch 'origin/master' into windows_C4554_C4018_warnings

Author: Artyom Abakumov

builds/posix/make.defaults

@@ -111,7 +111,7 @@ GLOB_OPTIONS:=
 #____________________________________________________________________________
 
 # Global c++ flags: firebird needs no RTTI, choose build standard and c++ specific warnings level
-PLUSPLUS_FLAGS:= -fno-rtti -std=c++17 -Werror=delete-incomplete
+PLUSPLUS_FLAGS:= -fno-rtti -std=c++17 -Werror=delete-incomplete -Werror=return-type
 
 # If this is defined then we use special rules useful for developers only
 IsDeveloper = @DEVEL_FLG@

builds/win32/msvc15/FirebirdCommon.props

@@ -28,6 +28,7 @@
       <UseFullPaths>false</UseFullPaths>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <TreatSpecificWarningsAsErrors>4715</TreatSpecificWarningsAsErrors>
     </ClCompile>
     <Link>
       <SuppressStartupBanner>true</SuppressStartupBanner>

src/common/CvtFormat.cpp

@@ -70,7 +70,7 @@ namespace
 			}
 		}
 
-		bool contains(const char* value, USHORT& outTimezoneId, FB_SIZE_T& outParsedTimezoneLength)
+		bool contains(const char* value, USHORT& outTimezoneId, unsigned int& outParsedTimezoneLength)
 		{
 			const TrieNode* currentNode = m_root;
 			FB_SIZE_T valueLength = fb_strlen(value);
@@ -97,7 +97,7 @@ namespace
 			TrieNode* currentNode = m_root;
 			FB_SIZE_T valueLength = fb_strlen(value);
 
-			for (FB_SIZE_T i = 0; i < valueLength; i++)
+			for (unsigned int i = 0; i < valueLength; i++)
 			{
 				int index = calculateIndex(value[i]);
 
@@ -460,7 +460,7 @@ namespace
 			patternStr = std::string_view(format + formatStart, offset - formatStart + 1);
 			bool isFound = false;
 
-			for (int j = 0; j < PatternsSize; j++)
+			for (unsigned int j = 0; j < PatternsSize; j++)
 			{
 				if (!strncmp(patterns[j], patternStr.data(), patternStr.length()))
 				{
@@ -1124,6 +1124,7 @@ namespace
 			return twelveHours == 12 ? twelveHours : 12 + twelveHours;
 
 		cb->err(Arg::Gds(isc_incorrect_hours_period) << string(period.data(), period.length()));
+		return 0; // suppress compiler warning/error
 	}
 
 	constexpr int roundYearPatternImplementation(int parsedRRValue, int currentYear)
@@ -1331,7 +1332,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 +1353,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]),
@@ -1541,7 +1542,7 @@ namespace
 				}
 				case Format::TZR:
 				{
-					FB_SIZE_T parsedTimezoneNameLength = 0;
+					unsigned int parsedTimezoneNameLength = 0;
 					const bool timezoneNameIsCorrect = timeZoneTrie().contains(str + strOffset, outTimezoneId, parsedTimezoneNameLength);
 					if (!timezoneNameIsCorrect)
 						status_exception::raise(Arg::Gds(isc_invalid_timezone_region) << string(str + strOffset, parsedTimezoneNameLength));
@@ -1668,7 +1669,7 @@ ISC_TIMESTAMP_TZ CVT_format_string_to_datetime(const dsc* desc, const Firebird::
 		stringUpper[i] = toupper(sourceString[i]);
 
 	string formatUpper(format.length(), '\0');
-	for (auto i = 0; i < format.length(); i++)
+	for (unsigned int i = 0; i < format.length(); i++)
 		formatUpper[i] = toupper(format[i]);
 
 	StringToDateTimeData cvtData;

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

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
 		{

src/common/call_service.cpp

@@ -465,7 +465,7 @@ void callRemoteServiceManager(ISC_STATUS* status,
 	{
 		const char request[] = {isc_info_svc_get_users};
 		int startQuery = 0;
-		Auth::StackUserData uData;
+		Auth::UserData uData;
 
 		for (;;)
 		{

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];
 

src/common/dsc.cpp

@@ -1356,7 +1356,7 @@ static bool validate_dsc_tables();
 
 
 
-int dsc::getStringLength() const
+USHORT dsc::getStringLength() const
 {
 	return DSC_string_length(this);
 }
@@ -1533,7 +1533,7 @@ bool DSC_make_descriptor(DSC* desc,
 }
 
 
-int DSC_string_length(const dsc* desc)
+USHORT DSC_string_length(const dsc* desc)
 {
 /**************************************
  *
@@ -1561,10 +1561,10 @@ int DSC_string_length(const dsc* desc)
 		return desc->dsc_length - sizeof(USHORT);
 	default:
  		if (!DTYPE_IS_EXACT(desc->dsc_dtype) || desc->dsc_scale == 0)
- 			return (int) _DSC_convert_to_text_length[desc->dsc_dtype];
+ 			return _DSC_convert_to_text_length[desc->dsc_dtype];
  		if (desc->dsc_scale < 0)
-			return (int) _DSC_convert_to_text_length[desc->dsc_dtype] + 1;
-		return (int) _DSC_convert_to_text_length[desc->dsc_dtype] + desc->dsc_scale;
+			return _DSC_convert_to_text_length[desc->dsc_dtype] + 1;
+		return _DSC_convert_to_text_length[desc->dsc_dtype] + desc->dsc_scale;
 	}
 }
 

src/common/dsc.h

@@ -499,7 +499,7 @@ typedef struct dsc
 		dsc_address = address;
 	}
 
-	int getStringLength() const;
+	USHORT getStringLength() const;
 
 	operator Ods::Descriptor() const
 	{

src/common/dsc_proto.h

@@ -26,7 +26,7 @@
 
 #include "../common/dsc.h"
 
-int			DSC_string_length(const struct dsc*);
+USHORT		DSC_string_length(const struct dsc*);
 const TEXT*	DSC_dtype_tostring(UCHAR);
 void		DSC_get_dtype_name(const dsc*, TEXT*, USHORT);
 bool		DSC_make_descriptor(dsc*, USHORT, SSHORT,