Fix conversion warnings in ini

+ use constexpr

Author: mrotteveel

src/jrd/ini.epp

@@ -97,7 +97,7 @@ namespace
 	}
 
 	template <typename T>
-	bool getCharsetByTextType(T& charSet, const USHORT subType)
+	bool getCharsetByTextType(T& charSet, const SSHORT subType) noexcept
 	{
 		switch (subType)
 		{
@@ -177,7 +177,7 @@ namespace
 
 	class SecurityHelper
 	{
-		static const unsigned FB_MAX_ACL_SIZE = 4096;
+		static inline constexpr unsigned FB_MAX_ACL_SIZE = 4096;
 
 	public:
 		SecurityHelper(const MetaName& ownerName, AutoRequest& handle)
@@ -207,7 +207,7 @@ namespace
 		}
 
 	protected:
-		UCHAR buffer[FB_MAX_ACL_SIZE];
+		UCHAR buffer[FB_MAX_ACL_SIZE]{};
 		ULONG length = 0;
 
 	protected:
@@ -661,7 +661,8 @@ void INI_format(thread_db* tdbb, const string& charset)
 		// Store RELATIONS and RELATION_FIELDS
 
 		dsc schemaDesc;
-		schemaDesc.makeText(strlen(SYSTEM_SCHEMA), CS_METADATA, (UCHAR*) SYSTEM_SCHEMA);
+		schemaDesc.makeText(static_cast<USHORT>(strlen(SYSTEM_SCHEMA)), CS_METADATA,
+			(UCHAR*) SYSTEM_SCHEMA);
 
 		AutoRequest handle2;
 
@@ -936,7 +937,7 @@ void INI_init(thread_db* tdbb)
 
 		relation->rel_formats = vec<Format*>::newVector(*pool, 1);
 
-		const auto majorVersion = ODS_VERSION;
+		constexpr auto majorVersion = ODS_VERSION;
 		const auto dbMinorVersion = dbb->dbb_ods_version ? dbb->dbb_minor_version : ODS_CURRENT;
 		// We need only the latest format for virtual tables
 		auto minorVersion = isPersistent ? ODS_RELEASED : ODS_CURRENT;
@@ -1209,7 +1210,8 @@ void INI_upgrade(thread_db* tdbb)
 	const char* context = nullptr;
 
 	dsc schemaDesc;
-	schemaDesc.makeText(strlen(SYSTEM_SCHEMA), CS_METADATA, (UCHAR*) SYSTEM_SCHEMA);
+	schemaDesc.makeText(static_cast<USHORT>(strlen(SYSTEM_SCHEMA)), CS_METADATA,
+		(UCHAR*) SYSTEM_SCHEMA);
 
 	try {
 

src/jrd/ini.h

@@ -58,7 +58,7 @@ enum name_ids
 
 #define NAME(name, id) name,
 
-static const TEXT* const names[] =
+static inline constexpr const TEXT* names[] =
 {
 	0,
 #include "../jrd/names.h"
@@ -68,9 +68,9 @@ static const TEXT* const names[] =
 //******************************
 // fields.h
 //******************************
-const USHORT BLOB_SIZE			= 8;
-const USHORT TIMESTAMP_SIZE		= 8;
-const USHORT TIMESTAMP_TZ_SIZE	= 12;
+inline constexpr USHORT BLOB_SIZE			= 8;
+inline constexpr USHORT TIMESTAMP_SIZE		= 8;
+inline constexpr USHORT TIMESTAMP_TZ_SIZE	= 12;
 
 // Pick up global ids
 
@@ -108,7 +108,7 @@ struct gfld
 	USHORT			gfld_ods_version;
 };
 
-static const struct gfld gfields[] =
+static inline constexpr struct gfld gfields[] =
 {
 #include "../jrd/fields.h"
 	{ 0, 0, dtype_unknown, 0, 0, NULL, 0, false, 0 }
@@ -142,19 +142,19 @@ typedef rids RIDS;
 				(int) name, (int) id, update, (int) ods,
 #define END_RELATION		0,
 
-const int RFLD_R_NAME	= 0;
-const int RFLD_R_ID		= 1;
-const int RFLD_R_ODS	= 2;
-const int RFLD_R_TYPE	= 3;
-const int RFLD_RPT		= 4;
+inline constexpr int RFLD_R_NAME	= 0;
+inline constexpr int RFLD_R_ID		= 1;
+inline constexpr int RFLD_R_ODS		= 2;
+inline constexpr int RFLD_R_TYPE	= 3;
+inline constexpr int RFLD_RPT		= 4;
 
-const int RFLD_F_NAME	= 0;
-const int RFLD_F_ID		= 1;
-const int RFLD_F_UPDATE	= 2;
-const int RFLD_F_ODS	= 3;
-const int RFLD_F_LENGTH	= 4;
+inline constexpr int RFLD_F_NAME	= 0;
+inline constexpr int RFLD_F_ID		= 1;
+inline constexpr int RFLD_F_UPDATE	= 2;
+inline constexpr int RFLD_F_ODS		= 3;
+inline constexpr int RFLD_F_LENGTH	= 4;
 
-static const int relfields[] =
+static inline constexpr int relfields[] =
 {
 #include "../jrd/relations.h"
 	0
@@ -186,7 +186,7 @@ struct rtyp
 
 #define TYPE(text, type, field)	{ text, type, field },
 
-static const rtyp types[] =
+static inline constexpr rtyp types[] =
 {
 #include "../jrd/types.h"
 	{NULL, 0, 0}