misc constexpr/noexcept changes

Author: mrotteveel

src/auth/SecureRemotePassword/client/SrpClient.cpp

@@ -110,7 +110,7 @@ int SrpClient::authenticate(CheckStatusWrapper* status, IClientBlock* cb)
 		{
 			Arg::Gds(isc_auth_data).raise();
 		}
-		const unsigned expectedLength =
+		constexpr unsigned expectedLength =
 			(RemotePassword::SRP_SALT_SIZE + RemotePassword::SRP_KEY_SIZE + 2) * 2;
 		if (length > expectedLength)
 		{

src/common/os/win32/isc_ipc.cpp

@@ -67,15 +67,14 @@
 
 namespace {
 
-static int process_id		= 0;
-const int MAX_OPN_EVENTS	= 40;
+static int process_id = 0;
+constexpr int MAX_OPN_EVENTS = 40;
 
 class OpenEvents
 {
 public:
-	explicit OpenEvents(Firebird::MemoryPool&)
+	explicit OpenEvents(Firebird::MemoryPool&) noexcept
 	{
-		memset(&m_events, 0, sizeof(m_events));
 		m_count = 0;
 		m_clock = 0;
 	}
@@ -143,7 +142,7 @@ class OpenEvents
 		FB_UINT64 age;
 	};
 
-	Item m_events[MAX_OPN_EVENTS];
+	Item m_events[MAX_OPN_EVENTS]{};
 	int m_count;
 	FB_UINT64 m_clock;
 	Firebird::Mutex m_mutex;

src/isql/isql.h

@@ -158,7 +158,7 @@ static inline constexpr sqltypes Column_types[] = {
 
 // Integral subtypes
 
-const int MAX_INTSUBTYPES	= 2;
+inline constexpr int MAX_INTSUBTYPES = 2;
 
 static inline constexpr const SCHAR* Integral_subtypes[] = {
 	"UNKNOWN",					// Defined type, keyword
@@ -315,7 +315,7 @@ struct IsqlVar
 class IsqlWireStats
 {
 public:
-	explicit IsqlWireStats(Firebird::IAttachment* att) :
+	explicit IsqlWireStats(Firebird::IAttachment* att) noexcept :
 		m_att(att)
 	{}
 

src/jrd/os/win32/winnt.cpp

@@ -85,11 +85,11 @@ class FileExtendLockGuard
 		}
 	}
 
-private:
 	// copying is prohibited
-	FileExtendLockGuard(const FileExtendLockGuard&);
-	FileExtendLockGuard& operator=(const FileExtendLockGuard&);
+	FileExtendLockGuard(const FileExtendLockGuard&) = delete;
+	FileExtendLockGuard& operator=(const FileExtendLockGuard&) = delete;
 
+private:
 	Firebird::RWLock* const m_lock;
 	const bool m_exclusive;
 };
@@ -106,19 +106,18 @@ using namespace Firebird;
 #define TEXT		SCHAR
 
 static bool	maybeCloseFile(HANDLE&);
-static bool seek_file(jrd_file*, BufferDesc*, OVERLAPPED*);
+static bool seek_file(jrd_file*, const BufferDesc*, OVERLAPPED*);
 static jrd_file* setup_file(Database*, const Firebird::PathName&, HANDLE, USHORT);
 static bool nt_error(const TEXT*, const jrd_file*, ISC_STATUS, FbStatusVector* const);
 
-inline static DWORD getShareFlags(const bool shared_access, bool temporary = false)
+inline static DWORD getShareFlags(const bool shared_access, bool temporary = false) noexcept
 {
 	return FILE_SHARE_READ | ((!temporary && shared_access) ? FILE_SHARE_WRITE : 0);
 }
 
-static const DWORD g_dwExtraFlags = FILE_FLAG_OVERLAPPED;
+static constexpr DWORD g_dwExtraFlags = FILE_FLAG_OVERLAPPED;
 
-static const DWORD g_dwExtraTempFlags = FILE_ATTRIBUTE_TEMPORARY |
-										FILE_FLAG_DELETE_ON_CLOSE;
+static constexpr DWORD g_dwExtraTempFlags = FILE_ATTRIBUTE_TEMPORARY | FILE_FLAG_DELETE_ON_CLOSE;
 
 
 void PIO_close(jrd_file* file)
@@ -345,7 +344,7 @@ bool PIO_header(thread_db* tdbb, UCHAR* address, unsigned length)
  *  callers should not rely on this behavior
  *
  **************************************/
-	const auto dbb = tdbb->getDatabase();
+	const auto* dbb = tdbb->getDatabase();
 
 	PageSpace* const pageSpace = dbb->dbb_page_manager.findPageSpace(DB_PAGE_SPACE);
 	jrd_file* const file = pageSpace->file;
@@ -507,7 +506,7 @@ jrd_file* PIO_open(thread_db* tdbb,
 			// being opened ReadOnly. This flag will be used later to compare with
 			// the Header Page flag setting to make sure that the database is set ReadOnly.
 			readOnly = true;
-			PageSpace* pageSpace = dbb->dbb_page_manager.findPageSpace(DB_PAGE_SPACE);
+			const PageSpace* pageSpace = dbb->dbb_page_manager.findPageSpace(DB_PAGE_SPACE);
 			if (!pageSpace->file)
 				dbb->dbb_flags |= DBB_being_opened_read_only;
 		}
@@ -537,7 +536,7 @@ bool PIO_read(thread_db* tdbb, jrd_file* file, BufferDesc* bdb, Ods::pag* page,
  *	Read a data page.
  *
  **************************************/
-	Database* const dbb = tdbb->getDatabase();
+	const Database* const dbb = tdbb->getDatabase();
 
 	const DWORD size = dbb->dbb_page_size;
 
@@ -696,8 +695,7 @@ bool PIO_write(thread_db* tdbb, jrd_file* file, BufferDesc* bdb, Ods::pag* page,
  *	Write a data page.
  *
  **************************************/
-
-	Database* const dbb = tdbb->getDatabase();
+	const Database* const dbb = tdbb->getDatabase();
 
 	const DWORD size = dbb->dbb_page_size;
 
@@ -750,7 +748,7 @@ ULONG PIO_get_number_of_pages(const jrd_file* file, const USHORT pagesize)
 }
 
 
-static bool seek_file(jrd_file*	file, BufferDesc* bdb, OVERLAPPED* overlapped)
+static bool seek_file(jrd_file*	file, const BufferDesc* bdb, OVERLAPPED* overlapped)
 {
 /**************************************
  *
@@ -762,7 +760,7 @@ static bool seek_file(jrd_file*	file, BufferDesc* bdb, OVERLAPPED* overlapped)
  *	Given a buffer descriptor block, seek to the proper page in that file.
  *
  **************************************/
-	BufferControl* const bcb = bdb->bdb_bcb;
+	const BufferControl* const bcb = bdb->bdb_bcb;
 	const ULONG page = bdb->bdb_page.getPageNum();
 
     LARGE_INTEGER liOffset;
@@ -773,7 +771,7 @@ static bool seek_file(jrd_file*	file, BufferDesc* bdb, OVERLAPPED* overlapped)
 	overlapped->Internal = 0;
 	overlapped->InternalHigh = 0;
 
-	ThreadSync* thd = ThreadSync::getThread(FB_FUNCTION);
+	const ThreadSync* thd = ThreadSync::getThread(FB_FUNCTION);
 	overlapped->hEvent = thd->getIOEvent();
 
 	return true;
@@ -803,7 +801,7 @@ static jrd_file* setup_file(Database* dbb, const Firebird::PathName& file_name,
 
 		// If this isn't the primary file, we're done
 
-		const auto pageSpace = dbb->dbb_page_manager.findPageSpace(DB_PAGE_SPACE);
+		const auto* pageSpace = dbb->dbb_page_manager.findPageSpace(DB_PAGE_SPACE);
 		if (pageSpace && pageSpace->file)
 			return file;
 

src/plugins/profiler/Profiler.cpp

@@ -58,14 +58,14 @@ SINT64 ticksToNanoseconds(FB_UINT64 ticks)
 	return CInt128((SINT64) ticks).mul(ONE_SECOND_IN_NS).div(ticksFrequency, 0).toInt64(0);
 }
 
-auto& defaultPool()
+auto& defaultPool() noexcept
 {
 	return *getDefaultMemoryPool();
 }
 
 void quote(string& name)
 {
-	const char QUOTE = '"';
+	constexpr char QUOTE = '"';
 
 	for (unsigned p = 0; p < name.length(); ++p)
 	{
@@ -82,7 +82,7 @@ void quote(string& name)
 
 struct Stats
 {
-	void hit(FB_UINT64 elapsedTicks)
+	void hit(FB_UINT64 elapsedTicks) noexcept
 	{
 		if (counter == 0 || elapsedTicks < minElapsedTicks)
 			minElapsedTicks = elapsedTicks;
@@ -103,14 +103,14 @@ struct Stats
 struct Cursor
 {
 	MetaString name{defaultPool()};
-	unsigned line;
-	unsigned column;
+	unsigned line = 0;
+	unsigned column = 0;
 };
 
 struct RecordSource
 {
 	std::optional<ULONG> parentId;
-	unsigned level;
+	unsigned level = 0;
 	string accessPath{defaultPool()};
 };
 
@@ -127,7 +127,7 @@ struct Statement
 	MetaString schemaName{defaultPool()};
 	MetaString packageName{defaultPool()};
 	MetaString routineName{defaultPool()};
-	SINT64 parentStatementId;
+	SINT64 parentStatementId = 0;
 	string sqlText{defaultPool()};
 };
 
@@ -138,10 +138,10 @@ struct Request
 {
 	bool dirty = true;
 	unsigned level = 0;
-	SINT64 statementId;
+	SINT64 statementId = 0;
 	SINT64 callerStatementId = 0;
 	SINT64 callerRequestId = 0;
-	ISC_TIMESTAMP_TZ startTimestamp;
+	ISC_TIMESTAMP_TZ startTimestamp{};
 	std::optional<ISC_TIMESTAMP_TZ> finishTimestamp;
 	std::optional<FB_UINT64> totalElapsedTicks;
 	NonPooledMap<CursorRecSourceKey, RecordSourceStats> recordSourcesStats{defaultPool()};

src/remote/server/os/win32/window.cpp

@@ -50,7 +50,7 @@ static HWND hPSDlg = NULL;
 static HINSTANCE hInstance = NULL;
 static USHORT usServerFlags;
 static HWND hMainWnd = NULL;
-const int SHUTDOWN_TIMEOUT = 5000;	// 5 sec
+constexpr int SHUTDOWN_TIMEOUT = 5000;	// 5 sec
 
 // Static functions to be called from this file only.
 static BOOL CanEndServer(HWND);