Fix warnings in examples (#8636)

mrotteveel · web-flow · commit 8c95ad3536e6 · 2025-07-16T10:13:52.000+02:00
diff --git a/builds/win32/msvc15/empbuild.vcxproj b/builds/win32/msvc15/empbuild.vcxproj
@@ -276,7 +276,10 @@
       <Project>{4fe03933-98cd-4879-a135-fd9430087a6b}</Project>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\..\examples\empbuild\empbuild.epp" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
diff --git a/builds/win32/msvc15/empbuild.vcxproj.filters b/builds/win32/msvc15/empbuild.vcxproj.filters
@@ -13,10 +13,18 @@
       <UniqueIdentifier>{307f31db-efbf-4c9c-9aa6-dbda2d6d8484}</UniqueIdentifier>
       <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
     </Filter>
+    <Filter Include="GPRE files">
+      <UniqueIdentifier>{dbcdcdf8-efc8-4106-b609-1e490745e955}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\gen\examples\empbuild.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
-</Project>
+  <ItemGroup>
+    <None Include="..\..\..\examples\empbuild\empbuild.epp">
+      <Filter>GPRE files</Filter>
+    </None>
+  </ItemGroup>
+</Project>
diff --git a/examples/dbcrypt/CryptKeyHolder.cpp b/examples/dbcrypt/CryptKeyHolder.cpp
@@ -273,7 +273,7 @@ int CryptKeyHolder::keyCallback(CheckStatusWrapper* status, ICryptKeyCallback* c
 			confEntry = getEntry(status, "Key");
 			if (confEntry)
 			{
-				key = confEntry->getIntValue();
+				key = static_cast<ISC_UCHAR>(confEntry->getIntValue());
 				confEntry->release();
 			}
 			else
@@ -311,7 +311,7 @@ ICryptKeyCallback* CryptKeyHolder::keyHandle(CheckStatusWrapper* status, const c
 	IConfigEntry* confEntry = getEntry(status, kn);
 	if (confEntry)
 	{
-		int k = confEntry->getIntValue();
+		int k = static_cast<int>(confEntry->getIntValue());
 		confEntry->release();
 		if (k > 0 && k < 256)
 		{
diff --git a/examples/dbcrypt/DbCrypt.cpp b/examples/dbcrypt/DbCrypt.cpp
@@ -119,7 +119,7 @@ class DbCrypt : public IDbCryptPluginImpl<DbCrypt, CheckStatusWrapper>
 
 private:
 	IPluginConfig* config;
-	char savedKeyName[32];
+	char savedKeyName[32]{};
 	ISC_UCHAR key;
 
 	std::atomic_int refCounter;
@@ -218,7 +218,7 @@ void DbCrypt::setKey(CheckStatusWrapper* status, unsigned int length, IKeyHolder
 			def->release();
 			if (confEntry)
 			{
-				v = confEntry->getIntValue();
+				v = static_cast<char>(confEntry->getIntValue());
 				confEntry->release();
 				if (v)
 				{
diff --git a/examples/dbcrypt/msvc/.gitignore b/examples/dbcrypt/msvc/.gitignore
@@ -0,0 +1 @@
+*.user
diff --git a/examples/empbuild/empbuild.epp b/examples/empbuild/empbuild.epp
@@ -287,7 +287,7 @@ while (fgets (line, 100, Fp) != NULL)
 	if (*line == '\n')
 	    break;
 
-	len = strlen (line);
+	len = static_cast<int>(strlen(line));
 	EXEC SQL INSERT CURSOR be VALUES (:line INDICATOR :len);
 	}
 
@@ -365,7 +365,7 @@ while (fgets (line, 100, Fp) != NULL)
 	if (*line == '\n')
 	    break;
 
-	len = strlen (line);
+	len = static_cast<int>(strlen(line));
 	EXEC SQL INSERT CURSOR bd VALUES (:line INDICATOR :len);
 	}
 
diff --git a/examples/extauth/ExtAuth.cpp b/examples/extauth/ExtAuth.cpp
@@ -32,9 +32,9 @@
 
 #define HANDSHAKE_DEBUG(A)
 
-const unsigned LOGINSIZE = 128u;
-const unsigned RANDSIZE = 32u;
-const unsigned SALTLEN = 8u;
+constexpr unsigned LOGINSIZE = 128u;
+constexpr unsigned RANDSIZE = 32u;
+constexpr unsigned SALTLEN = 8u;
 
 typedef unsigned int ULong;
 
@@ -138,7 +138,7 @@ class PluginData
 
 	PseudoRandom pseudoRand;
 	HashSha256 hash;
-	rsa_key privateKey;
+	rsa_key privateKey{};
 	int iniLvl;
 };
 
@@ -253,7 +253,7 @@ int ExtAuthClient::authenticate(ThrowStatusWrapper* status, IClientBlock* cBlock
 			error(status, "Malformed data from server - missing random block");
 
 		// next append login to random block
-		unsigned len = strlen(login);
+		unsigned len = static_cast<unsigned>(strlen(login));
 		if (len > LOGINSIZE)
 			len = LOGINSIZE;
 		memcpy(&bytes[RANDSIZE], login, len);
@@ -340,7 +340,7 @@ class ExtAuthServer : public IServerImpl<ExtAuthServer, ThrowStatusWrapper>, pub
 	}
 
 private:
-	unsigned char msg[RANDSIZE + LOGINSIZE];
+	unsigned char msg[RANDSIZE + LOGINSIZE]{};
 	bool sentData;
 };
 
@@ -377,7 +377,7 @@ int ExtAuthServer::authenticate(ThrowStatusWrapper* status, IServerBlock* sBlock
 
 		// decompose message
 		const char* login = reinterpret_cast<const char*>(data);
-		unsigned len = strnlen(login, dl);
+		unsigned len = static_cast<unsigned>(strnlen(login, dl));
 		if (len == dl)
 			error(status, "Wrong data from client - no signature in a message");
 		if (len == 0)
diff --git a/examples/extauth/Makefile b/examples/extauth/Makefile
@@ -61,7 +61,7 @@ KEYGEN_objects=$(INTERMED)/keygen.o
 TCWRAP_objects=$(INTERMED)/TcWrapper.o
 KEY_AUTH_objects=$(INTERMED)/ExtAuth.o
 
-CXXFLAGS=-std=c++11 -pthread -I$(ROOT)/include -fPIC $(TOMCRYPT_COMPILE)
+CXXFLAGS=-std=c++20 -pthread -I$(ROOT)/include -fPIC $(TOMCRYPT_COMPILE)
 LDFLAGS=-pthread -L$(LIB) -Wl,-rpath,'$$ORIGIN/../lib' $(TOMCRYPT_LINK)
 
 LINK_LIBS=-lfbclient -ltomcrypt -ltommath
diff --git a/examples/extauth/TcWrapper.cpp b/examples/extauth/TcWrapper.cpp
@@ -81,7 +81,7 @@ unsigned readHexKey(ThrowStatusWrapper* status, const char* hex, unsigned char*
 			error(status, "Key format error");
 		*k++ = static_cast<unsigned char>(c);
 	}
-	return k - key;
+	return static_cast<unsigned>(k - key);
 }
 
 void PseudoRandom::init(ThrowStatusWrapper* status)
diff --git a/examples/extauth/msvc/.gitignore b/examples/extauth/msvc/.gitignore
@@ -0,0 +1 @@
+*.user
diff --git a/examples/extauth/msvc/ExtAuth_MSVC15.vcxproj b/examples/extauth/msvc/ExtAuth_MSVC15.vcxproj
@@ -165,6 +165,7 @@
       <ConformanceMode>false</ConformanceMode>
       <AdditionalIncludeDirectories>..\..\..\src\include\;..\..\..\extern\libtomcrypt\src\headers\</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;LTM_DESC;WIN32</PreprocessorDefinitions>
+      <LanguageStandard>stdcpp20</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -219,6 +220,7 @@
       <ConformanceMode>false</ConformanceMode>
       <AdditionalIncludeDirectories>..\..\..\src\include\;..\..\..\extern\libtomcrypt\src\headers\</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;LTM_DESC;WIN32</PreprocessorDefinitions>
+      <LanguageStandard>stdcpp20</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -259,4 +261,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
diff --git a/examples/extauth/msvc/KeyGen_MSVC15.vcxproj b/examples/extauth/msvc/KeyGen_MSVC15.vcxproj
@@ -164,6 +164,7 @@
       <ConformanceMode>false</ConformanceMode>
       <AdditionalIncludeDirectories>..\..\..\src\include\;..\..\..\extern\libtomcrypt\src\headers\</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;LTM_DESC;WIN32</PreprocessorDefinitions>
+      <LanguageStandard>stdcpp20</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -215,6 +216,7 @@
       <ConformanceMode>false</ConformanceMode>
       <AdditionalIncludeDirectories>..\..\..\src\include\;..\..\..\extern\libtomcrypt\src\headers\</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;LTM_DESC;WIN32</PreprocessorDefinitions>
+      <LanguageStandard>stdcpp20</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -253,4 +255,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
diff --git a/examples/udr/Triggers.cpp b/examples/udr/Triggers.cpp
@@ -104,7 +104,7 @@ FB_UDR_BEGIN_TRIGGER(replicate)
 			SQL_DIALECT_CURRENT, inSqlDa), status, statusVector);
 		inSqlDa->sqlvar[0].sqldata = new char[sizeof(short) + inSqlDa->sqlvar[0].sqllen];
 		strncpy(inSqlDa->sqlvar[0].sqldata + sizeof(short), info, inSqlDa->sqlvar[0].sqllen);
-		*reinterpret_cast<short*>(inSqlDa->sqlvar[0].sqldata) = strlen(info);
+		*reinterpret_cast<short*>(inSqlDa->sqlvar[0].sqldata) = static_cast<short>(strlen(info));
 
 		XSQLDA* outSqlDa = reinterpret_cast<XSQLDA*>(new char[(XSQLDA_LENGTH(1))]);
 		outSqlDa->version = SQLDA_VERSION1;
@@ -136,7 +136,7 @@ FB_UDR_BEGIN_TRIGGER(replicate)
 
 			strcat(buffer, "    p");
 			const size_t buflen = strlen(buffer);
-			snprintf(buffer + buflen, sizeof(buffer) - buflen, "%d type of column \"%s\".\"%s\" = ?", i, table, name);
+			snprintf(buffer + buflen, sizeof(buffer) - buflen, "%u type of column \"%s\".\"%s\" = ?", i, table, name);
 		}
 
 		strcat(buffer,
@@ -177,7 +177,7 @@ FB_UDR_BEGIN_TRIGGER(replicate)
 				strcat(buffer, ", ");
 			strcat(buffer, ":p");
 			const size_t buflen = strlen(buffer);
-			snprintf(buffer + buflen, sizeof(buffer) - buflen, "%d", i);
+			snprintf(buffer + buflen, sizeof(buffer) - buflen, "%u", i);
 		}
 
 		strcat(buffer, ")\n        on external data source '");
@@ -255,7 +255,7 @@ FB_UDR_BEGIN_TRIGGER(replicate_persons)
 			statusVector, &stmtHandle, SQL_DIALECT_CURRENT, inSqlDa), status, statusVector);
 		inSqlDa->sqlvar[0].sqldata = new char[sizeof(short) + inSqlDa->sqlvar[0].sqllen];
 		strncpy(inSqlDa->sqlvar[0].sqldata + sizeof(short), info, inSqlDa->sqlvar[0].sqllen);
-		*reinterpret_cast<short*>(inSqlDa->sqlvar[0].sqldata) = strlen(info);
+		*reinterpret_cast<short*>(inSqlDa->sqlvar[0].sqldata) = static_cast<short>(strlen(info));
 
 		XSQLDA* outSqlDa = reinterpret_cast<XSQLDA*>(new char[(XSQLDA_LENGTH(1))]);
 		outSqlDa->version = SQLDA_VERSION1;

Original file line number	Diff line number	Diff line change
`@@ -273,7 +273,7 @@ int CryptKeyHolder::keyCallback(CheckStatusWrapper* status, ICryptKeyCallback* c`
`273`	`273`	`confEntry = getEntry(status, "Key");`
`274`	`274`	`if (confEntry)`
`275`	`275`	`{`
`276`		`- key = confEntry->getIntValue();`
	`276`	`+ key = static_cast<ISC_UCHAR>(confEntry->getIntValue());`
`277`	`277`	`confEntry->release();`
`278`	`278`	`}`
`279`	`279`	`else`
`@@ -311,7 +311,7 @@ ICryptKeyCallback* CryptKeyHolder::keyHandle(CheckStatusWrapper* status, const c`
`311`	`311`	`IConfigEntry* confEntry = getEntry(status, kn);`
`312`	`312`	`if (confEntry)`
`313`	`313`	`{`
`314`		`- int k = confEntry->getIntValue();`
	`314`	`+ int k = static_cast<int>(confEntry->getIntValue());`
`315`	`315`	`confEntry->release();`
`316`	`316`	`if (k > 0 && k < 256)`
`317`	`317`	`{`
Original file line number	Diff line number	Diff line change
`@@ -287,7 +287,7 @@ while (fgets (line, 100, Fp) != NULL)`
`287`	`287`	`if (*line == '\n')`
`288`	`288`	`break;`
`289`	`289`
`290`		`- len = strlen (line);`
	`290`	`+ len = static_cast<int>(strlen(line));`
`291`	`291`	`EXEC SQL INSERT CURSOR be VALUES (:line INDICATOR :len);`
`292`	`292`	`}`
`293`	`293`
`@@ -365,7 +365,7 @@ while (fgets (line, 100, Fp) != NULL)`
`365`	`365`	`if (*line == '\n')`
`366`	`366`	`break;`
`367`	`367`
`368`		`- len = strlen (line);`
	`368`	`+ len = static_cast<int>(strlen(line));`
`369`	`369`	`EXEC SQL INSERT CURSOR bd VALUES (:line INDICATOR :len);`
`370`	`370`	`}`
`371`	`371`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ unsigned readHexKey(ThrowStatusWrapper* status, const char* hex, unsigned char*`
`81`	`81`	`error(status, "Key format error");`
`82`	`82`	`*k++ = static_cast<unsigned char>(c);`
`83`	`83`	`}`
`84`		`- return k - key;`
	`84`	`+ return static_cast<unsigned>(k - key);`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`void PseudoRandom::init(ThrowStatusWrapper* status)`