Fix -Wswitch warnings in config

+ (inline) constexpr

Author: mrotteveel

src/common/config/config.cpp

@@ -282,7 +282,7 @@ void Config::loadValues(const ConfigFile& file, const char* srcName)
 	checkValues();
 }
 
-static const char* txtServerModes[6] =
+static constexpr const char* txtServerModes[6] =
 {
 	"Super", "ThreadedDedicated",
 	"SuperClassic", "ThreadedShared",
@@ -445,6 +445,9 @@ Config::~Config()
 			break;
 		//case TYPE_STRING_VECTOR:
 		//	break;
+		default:
+			// nothing to free
+			break;
 		}
 	}
 
@@ -581,6 +584,9 @@ ConfigValue Config::specialProcessing(ConfigKey key, ConfigValue val)
 				val.strVal = "security.db";
 		}
 		break;
+	default:
+		// no special processing
+		break;
 	}
 
 	return val;
@@ -724,7 +730,7 @@ int Config::getWireCrypt(WireCryptMode wcMode) const
 ///	class FirebirdConf
 
 // array format: major, minor, release, build
-static unsigned short fileVerNumber[4] = {FILE_VER_NUMBER};
+static constexpr unsigned short fileVerNumber[4] = {FILE_VER_NUMBER};
 
 static inline unsigned int getPartialVersion()
 {
@@ -738,8 +744,8 @@ static inline unsigned int getFullVersion()
 	return getPartialVersion() | fileVerNumber[3];
 }
 
-static unsigned int PARTIAL_MASK = 0xFFFF0000;
-static unsigned int KEY_MASK = 0xFFFF;
+static constexpr unsigned int PARTIAL_MASK = 0xFFFF0000;
+static constexpr unsigned int KEY_MASK = 0xFFFF;
 
 static inline void checkKey(unsigned int& key)
 {

src/common/config/config.h

@@ -78,17 +78,17 @@ extern const char*	GCPolicyCooperative;
 extern const char*	GCPolicyBackground;
 extern const char*	GCPolicyCombined;
 
-const int WIRE_CRYPT_DISABLED = 0;
-const int WIRE_CRYPT_ENABLED = 1;
-const int WIRE_CRYPT_REQUIRED = 2;
+inline constexpr int WIRE_CRYPT_DISABLED = 0;
+inline constexpr int WIRE_CRYPT_ENABLED = 1;
+inline constexpr int WIRE_CRYPT_REQUIRED = 2;
 
 enum WireCryptMode {WC_CLIENT, WC_SERVER};		// Have different defaults
 
-const int MODE_SUPER = 0;
-const int MODE_SUPERCLASSIC = 1;
-const int MODE_CLASSIC = 2;
+inline constexpr int MODE_SUPER = 0;
+inline constexpr int MODE_SUPERCLASSIC = 1;
+inline constexpr int MODE_CLASSIC = 2;
 
-const char* const CONFIG_FILE = "firebird.conf";
+constexpr const char* CONFIG_FILE = "firebird.conf";
 
 struct ConfigValue
 {
@@ -209,7 +209,7 @@ struct ConfigEntry
 	ConfigValue default_value;
 };
 
-constexpr ConfigEntry entries[MAX_CONFIG_KEY] =
+inline constexpr ConfigEntry entries[MAX_CONFIG_KEY] =
 {
 	{TYPE_INTEGER,	"TempBlockSize",			true,	1048576},	// bytes
 	{TYPE_INTEGER,	"TempCacheLimit",			false,	-1},		// bytes