Fix conversion warnings in config_file

+ constexpr

Author: mrotteveel

src/common/config/config_file.cpp

@@ -342,7 +342,7 @@ ConfigFile::LineType ConfigFile::parseLine(const char* fileName, const String& i
 					return LINE_INCLUDE;
 				}
 			}
-			// fall down ...
+			[[fallthrough]];
 		case '\r':
 			break;
 
@@ -375,7 +375,7 @@ ConfigFile::LineType ConfigFile::parseLine(const char* fileName, const String& i
 				}
 				break;
 			}
-			// fall through ....
+			[[fallthrough]];
 
 		default:
 			if (inString >= 2)		// Something after the end of line
@@ -414,7 +414,7 @@ ConfigFile::LineType ConfigFile::parseLine(const char* fileName, const String& i
  *	Substitute macro values in a string
  */
 
-unsigned ConfigFile::getDirSeparatorLength(const String& value, size_t separatorPosition) const
+unsigned ConfigFile::getDirSeparatorLength(const String& value, String::size_type separatorPosition) const
 {
 	if (separatorPosition >= value.length())
 		return 0;
@@ -481,7 +481,7 @@ bool ConfigFile::macroParse(String& value, const char* fileName) const
 
 		if (flags & REGEXP_SUPPORT)
 		{
-			size_t pos = 0;
+			String::size_type pos = 0;
 			while ((pos = macro.find('\\', pos)) != String::npos)
 			{
 				macro.insert(pos, "\\");
@@ -567,7 +567,7 @@ bool ConfigFile::substituteStandardDir(const String& from, String& to) const
 {
 	using namespace fb_utils;
 
-	struct Dir {
+	constexpr struct Dir {
 		unsigned code;
 		const char* name;
 	} dirs[] = {

src/common/config/config_file.h

@@ -52,12 +52,12 @@ class ConfigFile : public Firebird::AutoStorage, public Firebird::RefCounted
 {
 public:
 	// flags for config file
-	static const USHORT HAS_SUB_CONF	= 0x01;
-	static const USHORT ERROR_WHEN_MISS	= 0x02;
-	static const USHORT NATIVE_ORDER	= 0x04;
-	static const USHORT NO_COMMENTS		= 0x08;
-	static const USHORT CUSTOM_MACROS	= 0x10;
-	static const USHORT REGEXP_SUPPORT	= 0x20;
+	static inline constexpr USHORT HAS_SUB_CONF		= 0x01;
+	static inline constexpr USHORT ERROR_WHEN_MISS	= 0x02;
+	static inline constexpr USHORT NATIVE_ORDER		= 0x04;
+	static inline constexpr USHORT NO_COMMENTS		= 0x08;
+	static inline constexpr USHORT CUSTOM_MACROS	= 0x10;
+	static inline constexpr USHORT REGEXP_SUPPORT	= 0x20;
 
 	// enum to distinguish ctors
 	enum UseText {USE_TEXT};
@@ -134,7 +134,7 @@ class ConfigFile : public Firebird::AutoStorage, public Firebird::RefCounted
 	USHORT flags;
 	unsigned includeLimit;
 	ConfigCache* filesCache;
-	static const unsigned INCLUDE_LIMIT = 64;
+	static inline constexpr unsigned INCLUDE_LIMIT = 64;
 
 	// utilities
 	bool getLine(Stream* stream, String&, unsigned int&);
@@ -146,7 +146,7 @@ class ConfigFile : public Firebird::AutoStorage, public Firebird::RefCounted
 	bool wildCards(const char* currentFileName, const Firebird::PathName& pathPrefix, FilesArray& components);
 	bool substituteStandardDir(const String& from, String& to) const;
 	void adjustMacroReplacePositions(const String& value, const String& macro, String::size_type& from, String::size_type& to) const;
-	unsigned getDirSeparatorLength(const String& value, size_t subFrom) const;
+	unsigned getDirSeparatorLength(const String& value, String::size_type subFrom) const;
 };
 
 #endif	// CONFIG_CONFIG_FILE_H