inline constexpr + const in install

Author: mrotteveel

builds/win32/msvc15/instclient.vcxproj

@@ -254,6 +254,7 @@
     <ClCompile Include="..\..\..\src\utilities\install\install_client.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\..\src\utilities\install\install_nt.h" />
     <ClInclude Include="..\..\..\src\utilities\install\install_proto.h" />
   </ItemGroup>
   <ItemGroup>
@@ -269,4 +270,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

builds/win32/msvc15/instclient.vcxproj.filters

@@ -25,6 +25,9 @@
     <ClInclude Include="..\..\..\src\utilities\install\install_proto.h">
       <Filter>Header files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\src\utilities\install\install_nt.h">
+      <Filter>Header files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\..\src\jrd\version.rc">

src/utilities/install/install.cpp

@@ -32,10 +32,10 @@
 #include "../utilities/install/install_nt.h"
 #include "../utilities/install/install_proto.h"
 
-const DWORD GDSVER_MAJOR	= 6;
-const DWORD GDSVER_MINOR	= 3;
+constexpr DWORD GDSVER_MAJOR = 6;
+constexpr DWORD GDSVER_MINOR = 3;
 
-const char* SHARED_KEY	= "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\SharedDLLs";
+constexpr const char* SHARED_KEY = "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\SharedDLLs";
 
 namespace
 {
@@ -78,7 +78,7 @@ USHORT CLIENT_install(const TEXT * rootdir, USHORT client, bool sw_force, err_ha
 
 	// Get Windows System Directory
 	TEXT sysdir[MAXPATHLEN];
-	int len = GetSystemDirectory(sysdir, sizeof(sysdir));
+	const int len = GetSystemDirectory(sysdir, sizeof(sysdir));
 	if (len == 0)
 		return (*err_handler) (GetLastError(), "GetSystemDirectory()");
 
@@ -172,12 +172,14 @@ USHORT CLIENT_install(const TEXT * rootdir, USHORT client, bool sw_force, err_ha
 	// Move _FBCLIENT.DLL as the final target
 	if (MoveFile(workfile, target) == 0)
 	{
-		// MoveFile failed, this is expected if target already exists
-		ULONG werr = GetLastError();
-		if (werr != ERROR_ALREADY_EXISTS)
 		{
-			DeleteFile(workfile);
-			return (*err_handler) (werr, "MoveFile(_FBCLIENT.DLL, 'target')");
+			// MoveFile failed, this is expected if target already exists
+			const ULONG werr = GetLastError();
+			if (werr != ERROR_ALREADY_EXISTS)
+			{
+				DeleteFile(workfile);
+				return (*err_handler) (werr, "MoveFile(_FBCLIENT.DLL, 'target')");
+			}
 		}
 
 		// Failed moving because a destination target file already exists
@@ -207,15 +209,15 @@ USHORT CLIENT_install(const TEXT * rootdir, USHORT client, bool sw_force, err_ha
 
 				if ((*ntmove) (target, 0, MOVEFILE_DELAY_UNTIL_REBOOT) == 0)
 				{
-					ULONG werr = GetLastError();
+					const ULONG werr = GetLastError();
 					FreeLibrary(kernel32);
 					DeleteFile(workfile);
 					return (*err_handler) (werr, "MoveFileEx(delete 'target')");
 				}
 
 				if ((*ntmove) (workfile, target, MOVEFILE_DELAY_UNTIL_REBOOT) == 0)
 				{
-					ULONG werr = GetLastError();
+					const ULONG werr = GetLastError();
 					FreeLibrary(kernel32);
 					DeleteFile(workfile);
 					return (*err_handler) (werr, "MoveFileEx(replace 'target')");
@@ -250,15 +252,15 @@ USHORT CLIENT_install(const TEXT * rootdir, USHORT client, bool sw_force, err_ha
 		if (WritePrivateProfileString("rename", "NUL", starget,
 				"WININIT.INI") == 0)
 		{
-			ULONG werr = GetLastError();
+			const ULONG werr = GetLastError();
 			DeleteFile(workfile);
 			return (*err_handler) (werr, "WritePrivateProfileString(delete 'target')");
 		}
 
 		if (WritePrivateProfileString("rename", starget, sworkfile,
 				"WININIT.INI") == 0)
 		{
-			ULONG werr = GetLastError();
+			const ULONG werr = GetLastError();
 			DeleteFile(workfile);
 			return (*err_handler) (werr, "WritePrivateProfileString(replace 'target')");
 		}
@@ -301,7 +303,7 @@ USHORT CLIENT_remove(const TEXT* rootdir, USHORT client, bool sw_force, err_hand
 
 	// Get Windows System Directory
 	TEXT sysdir[MAXPATHLEN];
-	int len = GetSystemDirectory(sysdir, sizeof(sysdir));
+	const int len = GetSystemDirectory(sysdir, sizeof(sysdir));
 	if (len == 0)
 		return (*err_handler) (GetLastError(), "GetSystemDirectory()");
 
@@ -370,7 +372,7 @@ USHORT CLIENT_query(USHORT client, ULONG& verMS, ULONG& verLS, ULONG& sharedCoun
 
 	// Get Windows System Directory
 	TEXT sysdir[MAXPATHLEN];
-	int len = GetSystemDirectory(sysdir, sizeof(sysdir));
+	const int len = GetSystemDirectory(sysdir, sizeof(sysdir));
 	if (len == 0)
 		return (*err_handler) (GetLastError(), "GetSystemDirectory()");
 
@@ -380,13 +382,12 @@ USHORT CLIENT_query(USHORT client, ULONG& verMS, ULONG& verLS, ULONG& sharedCoun
 	lstrcat(target, client == CLIENT_GDS ? GDS32_NAME : FBCLIENT_NAME);
 
 	verMS = verLS = sharedCount = 0;
-	USHORT status = GetVersion(target, verMS, verLS, err_handler);
+	const USHORT status = GetVersion(target, verMS, verLS, err_handler);
 	if (status != FB_SUCCESS)
 		return status;	// FB_FAILURE or FB_INSTALL_FILE_NOT_FOUND
 
 	HKEY hkey;
-	LONG keystatus = RegOpenKeyEx(HKEY_LOCAL_MACHINE, SHARED_KEY, 0,
-		KEY_READ, &hkey);
+	const LONG keystatus = RegOpenKeyEx(HKEY_LOCAL_MACHINE, SHARED_KEY, 0, KEY_READ, &hkey);
 	if (keystatus != ERROR_SUCCESS)
 		return (*err_handler) (keystatus, "RegOpenKeyEx");
 
@@ -428,18 +429,18 @@ USHORT GetVersion(const TEXT* filename, DWORD& verMS, DWORD& verLS, err_handler_
 	// can't be deleted between check for existence and version read.
 
 	DWORD dwUnused;
-	DWORD rsize = GetFileVersionInfoSize(const_cast<TEXT*>(filename), &dwUnused);
+	const DWORD rsize = GetFileVersionInfoSize(filename, &dwUnused);
 	if (rsize == 0)
 	{
-		ULONG werr = GetLastError();
+		const ULONG werr = GetLastError();
 		CloseHandle(hfile);
 		return (*err_handler) (werr, "GetFileVersionInfoSize()");
 	}
 
 	BYTE* hver = new BYTE[rsize];
-	if (! GetFileVersionInfo(const_cast<TEXT*>(filename), 0, rsize, hver))
+	if (!GetFileVersionInfo(filename, 0, rsize, hver))
 	{
-		ULONG werr = GetLastError();
+		const ULONG werr = GetLastError();
 		delete[] hver;
 		CloseHandle(hfile);
 		return (*err_handler) (werr, "GetFileVersionInfo()");
@@ -450,7 +451,7 @@ USHORT GetVersion(const TEXT* filename, DWORD& verMS, DWORD& verLS, err_handler_
 	UINT uiUnused;
 	if (! VerQueryValue(hver, "\\", (void**)&ffi, &uiUnused))
 	{
-		ULONG werr = GetLastError();
+		const ULONG werr = GetLastError();
 		delete[] hver;
 		return (*err_handler) (werr, "VerQueryValue()");
 	}
@@ -495,13 +496,13 @@ USHORT PatchVersion(const TEXT* filename, DWORD verMS, err_handler_t err_handler
 	if (hfile == INVALID_HANDLE_VALUE)
 		return (*err_handler) (GetLastError(), "CreateFile()");
 
-	DWORD fsize = GetFileSize(hfile, 0);
+	const DWORD fsize = GetFileSize(hfile, 0);
 
 	HANDLE hmap = CreateFileMapping(hfile, 0,
 		PAGE_READWRITE | SEC_COMMIT, 0, 0, 0);
 	if (hmap == 0)
 	{
-		ULONG werr = GetLastError();
+		const ULONG werr = GetLastError();
 		CloseHandle(hfile);
 		return (*err_handler) (werr, "CreateFileMapping()");
 	}
@@ -510,22 +511,22 @@ USHORT PatchVersion(const TEXT* filename, DWORD verMS, err_handler_t err_handler
 		FILE_MAP_WRITE, 0, 0, 0));
 	if (mem == 0)
 	{
-		ULONG werr = GetLastError();
+		const ULONG werr = GetLastError();
 		CloseHandle(hmap);
 		CloseHandle(hfile);
 		return (*err_handler) (werr, "MapViewOfFile()");
 	}
 
 	// This is a "magic value" that will allow locating the version info.
 	// Windows itself does something equivalent internally.
-	const BYTE lookup[] =
+	constexpr BYTE lookup[] =
 	{
 		'V', 0, 'S', 0, '_', 0,
 		'V', 0, 'E', 0, 'R', 0, 'S', 0, 'I', 0, 'O', 0, 'N', 0, '_', 0,
 		'I', 0, 'N', 0, 'F', 0, 'O', 0, 0, 0, 0, 0, 0xbd, 0x04, 0xef, 0xfe
 	};
-	BYTE* p = mem;				// First byte of mapped file
-	BYTE* end = mem + fsize;	// Last byte + 1 of mapped file
+	BYTE* p = mem;					// First byte of mapped file
+	const BYTE* end = mem + fsize;	// Last byte + 1 of mapped file
 
 	int i = 0;
 	while (p < end)

src/utilities/install/install_client.cpp

@@ -35,9 +35,9 @@
 #include "../utilities/install/install_proto.h"
 
 static USHORT inst_error(ULONG, const TEXT*);
-static void usage_exit();
+[[noreturn]] static void usage_exit();
 
-static const struct
+static constexpr struct
 {
 	const TEXT* name;
 	USHORT abbrev;
@@ -50,7 +50,7 @@ static const struct
 	{NULL, 0, 0}
 };
 
-static const struct
+static constexpr struct
 {
 	const TEXT* name;
 	USHORT abbrev;
@@ -242,7 +242,7 @@ int CLIB_ROUTINE main( int argc, char **argv)
 					if (sharedCount)
 					{
 						printf("Installed %s version : %u.%u.%u.%u "
-							"(shared DLL count %d)\n",
+							"(shared DLL count %u)\n",
 							clientname,
 							verMS >> 16, verMS & 0x0000ffff,
 							verLS >> 16, verLS & 0x0000ffff,
@@ -302,7 +302,7 @@ static USHORT inst_error(ULONG status, const TEXT* string)
 								sizeof(buffer),
 								NULL))
 		{
-			printf("Windows NT error %" SLONGFORMAT"\n", status);
+			printf("Windows NT error %u\n", status);
 		}
 		else
 		{
@@ -313,7 +313,7 @@ static USHORT inst_error(ULONG status, const TEXT* string)
 	return FB_FAILURE;
 }
 
-static void usage_exit()
+[[noreturn]] static void usage_exit()
 {
 /**************************************
  *

src/utilities/install/install_nt.h

@@ -24,76 +24,76 @@
 #ifndef UTILITIES_INSTALL_NT_H
 #define UTILITIES_INSTALL_NT_H
 
-static const char* const REMOTE_SERVICE			= "FirebirdServer%s";
-static const char* const REMOTE_DISPLAY_NAME	= "Firebird Server - %s";
-static const char* const REMOTE_DISPLAY_DESCR	= "Firebird Database Server - www.firebirdsql.org";
-static const char* const REMOTE_EXECUTABLE		= "firebird";
+static inline constexpr const char* REMOTE_SERVICE			= "FirebirdServer%s";
+static inline constexpr const char* REMOTE_DISPLAY_NAME		= "Firebird Server - %s";
+static inline constexpr const char* REMOTE_DISPLAY_DESCR	= "Firebird Database Server - www.firebirdsql.org";
+static inline constexpr const char* REMOTE_EXECUTABLE		= "firebird";
 
-static const char* const ISCGUARD_SERVICE		= "FirebirdGuardian%s";
-static const char* const ISCGUARD_DISPLAY_NAME	= "Firebird Guardian - %s";
-static const char* const ISCGUARD_DISPLAY_DESCR	= "Firebird Server Guardian - www.firebirdsql.org";
-static const char* const ISCGUARD_EXECUTABLE	= "fbguard";
+static inline constexpr const char* ISCGUARD_SERVICE		= "FirebirdGuardian%s";
+static inline constexpr const char* ISCGUARD_DISPLAY_NAME	= "Firebird Guardian - %s";
+static inline constexpr const char* ISCGUARD_DISPLAY_DESCR	= "Firebird Server Guardian - www.firebirdsql.org";
+static inline constexpr const char* ISCGUARD_EXECUTABLE		= "fbguard";
 
-static const char* const SERVER_MUTEX			= "FirebirdServerMutex%s";
-static const char* const GUARDIAN_MUTEX			= "FirebirdGuardianMutex%s";
+static inline constexpr const char* SERVER_MUTEX			= "FirebirdServerMutex%s";
+static inline constexpr const char* GUARDIAN_MUTEX			= "FirebirdGuardianMutex%s";
 
-static const char* const FB_DEFAULT_INSTANCE	= "DefaultInstance";
+static inline constexpr const char* FB_DEFAULT_INSTANCE	= "DefaultInstance";
 
 // Starting with 128 the service params are user defined
-const DWORD SERVICE_CREATE_GUARDIAN_MUTEX	= 128;
+inline constexpr DWORD SERVICE_CREATE_GUARDIAN_MUTEX	= 128;
 //#define REMOTE_DEPENDENCIES		"Tcpip\0\0"
 
 // sw_command
-const USHORT COMMAND_NONE		= 0;
-const USHORT COMMAND_INSTALL	= 1;
-const USHORT COMMAND_REMOVE		= 2;
-const USHORT COMMAND_START		= 3;
-const USHORT COMMAND_STOP		= 4;
-//const USHORT COMMAND_CONFIG	= 5;
-const USHORT COMMAND_QUERY		= 6;
+inline constexpr USHORT COMMAND_NONE	= 0;
+inline constexpr USHORT COMMAND_INSTALL	= 1;
+inline constexpr USHORT COMMAND_REMOVE	= 2;
+inline constexpr USHORT COMMAND_START	= 3;
+inline constexpr USHORT COMMAND_STOP	= 4;
+//inline constexpr USHORT COMMAND_CONFIG	= 5;
+inline constexpr USHORT COMMAND_QUERY	= 6;
 
 // sw_startup
-const USHORT STARTUP_DEMAND		= 0;
-const USHORT STARTUP_AUTO		= 1;
+inline constexpr USHORT STARTUP_DEMAND	= 0;
+inline constexpr USHORT STARTUP_AUTO	= 1;
 
 // sw_guardian
-const USHORT NO_GUARDIAN		= 0;
-const USHORT USE_GUARDIAN		= 1;
+inline constexpr USHORT NO_GUARDIAN		= 0;
+inline constexpr USHORT USE_GUARDIAN	= 1;
 
 // sw_mode
-const USHORT DEFAULT_PRIORITY	= 0;
-const USHORT NORMAL_PRIORITY	= 1;
-const USHORT HIGH_PRIORITY		= 2;
+inline constexpr USHORT DEFAULT_PRIORITY	= 0;
+inline constexpr USHORT NORMAL_PRIORITY		= 1;
+inline constexpr USHORT HIGH_PRIORITY		= 2;
 
 // sw_arch
-const USHORT ARCH_SS			= 0;
-const USHORT ARCH_CS			= 1;
+inline constexpr USHORT ARCH_SS = 0;
+inline constexpr USHORT ARCH_CS = 1;
 
 // sw_client
-const USHORT CLIENT_NONE		= 0;
-const USHORT CLIENT_FB			= 1;
-const USHORT CLIENT_GDS			= 2;
+inline constexpr USHORT CLIENT_NONE	= 0;
+inline constexpr USHORT CLIENT_FB	= 1;
+inline constexpr USHORT CLIENT_GDS	= 2;
 
-static const char* const GDS32_NAME			= "GDS32.DLL";
-static const char* const FBCLIENT_NAME		= "FBCLIENT.DLL";
+static inline constexpr const char* GDS32_NAME		= "GDS32.DLL";
+static inline constexpr const char* FBCLIENT_NAME	= "FBCLIENT.DLL";
 
 // instsvc status codes
-const USHORT IB_SERVICE_ALREADY_DEFINED			= 100;
-const USHORT IB_SERVICE_RUNNING					= 101;
-const USHORT FB_PRIVILEGE_ALREADY_GRANTED		= 102;
-const USHORT FB_SERVICE_STATUS_RUNNING			= 100;
-const USHORT FB_SERVICE_STATUS_STOPPED			= 111;
-const USHORT FB_SERVICE_STATUS_PENDING			= 112;
-const USHORT FB_SERVICE_STATUS_NOT_INSTALLED	= 113;
-const USHORT FB_SERVICE_STATUS_UNKNOWN			= 114;
+inline constexpr USHORT IB_SERVICE_ALREADY_DEFINED		= 100;
+inline constexpr USHORT IB_SERVICE_RUNNING				= 101;
+inline constexpr USHORT FB_PRIVILEGE_ALREADY_GRANTED	= 102;
+inline constexpr USHORT FB_SERVICE_STATUS_RUNNING		= 100;
+inline constexpr USHORT FB_SERVICE_STATUS_STOPPED		= 111;
+inline constexpr USHORT FB_SERVICE_STATUS_PENDING		= 112;
+inline constexpr USHORT FB_SERVICE_STATUS_NOT_INSTALLED	= 113;
+inline constexpr USHORT FB_SERVICE_STATUS_UNKNOWN		= 114;
 
 // instclient status codes
-const USHORT FB_INSTALL_COPY_REQUIRES_REBOOT	= 200;
-const USHORT FB_INSTALL_SAME_VERSION_FOUND		= 201;
-const USHORT FB_INSTALL_NEWER_VERSION_FOUND		= 202;
-const USHORT FB_INSTALL_FILE_NOT_FOUND 			= 203;
-const USHORT FB_INSTALL_CANT_REMOVE_ALIEN_VERSION	= 204;
-const USHORT FB_INSTALL_FILE_PROBABLY_IN_USE	= 205;
-const USHORT FB_INSTALL_SHARED_COUNT_ZERO  		= 206;
+inline constexpr USHORT FB_INSTALL_COPY_REQUIRES_REBOOT	= 200;
+inline constexpr USHORT FB_INSTALL_SAME_VERSION_FOUND	= 201;
+inline constexpr USHORT FB_INSTALL_NEWER_VERSION_FOUND	= 202;
+inline constexpr USHORT FB_INSTALL_FILE_NOT_FOUND 		= 203;
+inline constexpr USHORT FB_INSTALL_CANT_REMOVE_ALIEN_VERSION	= 204;
+inline constexpr USHORT FB_INSTALL_FILE_PROBABLY_IN_USE	= 205;
+inline constexpr USHORT FB_INSTALL_SHARED_COUNT_ZERO  	= 206;
 
 #endif // UTILITIES_INSTALL_NT_H