constexpr + noexcept jrd

Author: mrotteveel

src/jrd/Attachment.cpp

@@ -380,7 +380,7 @@ string Jrd::Attachment::stringToUserCharSet(thread_db* tdbb, const string& str)
 		return str;
 
 	HalfStaticArray<UCHAR, BUFFER_MEDIUM> buffer(str.length() * sizeof(ULONG));
-	ULONG len = INTL_convert_bytes(tdbb, att_charset, buffer.begin(), buffer.getCapacity(),
+	const ULONG len = INTL_convert_bytes(tdbb, att_charset, buffer.begin(), buffer.getCapacity(),
 		CS_METADATA, (const BYTE*) str.c_str(), str.length(), ERR_post);
 
 	return string((char*) buffer.begin(), len);
@@ -454,8 +454,8 @@ static void runDBTriggers(thread_db* tdbb, TriggerAction action)
 {
 	fb_assert(action == TRIGGER_CONNECT || action == TRIGGER_DISCONNECT);
 
-	Database* dbb = tdbb->getDatabase();
-	Attachment* att = tdbb->getAttachment();
+	const Database* dbb = tdbb->getDatabase();
+	const Attachment* att = tdbb->getAttachment();
 	fb_assert(dbb);
 	fb_assert(att);
 
@@ -641,7 +641,7 @@ void Jrd::Attachment::mergeStats(bool pageStatsOnly)
 }
 
 
-bool Attachment::hasActiveRequests() const
+bool Attachment::hasActiveRequests() const noexcept
 {
 	for (const jrd_tra* transaction = att_transactions;
 		transaction; transaction = transaction->tra_next)
@@ -661,7 +661,7 @@ bool Attachment::hasActiveRequests() const
 // Find an inactive incarnation of a system request. If necessary, clone it.
 Request* Jrd::Attachment::findSystemRequest(thread_db* tdbb, USHORT id, USHORT which)
 {
-	static const int MAX_RECURSION = 100;
+	constexpr int MAX_RECURSION = 100;
 
 	// If the request hasn't been compiled or isn't active, there're nothing to do.
 
@@ -1084,7 +1084,7 @@ unsigned int Attachment::getActualIdleTimeout() const
 
 void Attachment::setupIdleTimer(bool clear)
 {
-	unsigned int timeout = clear ? 0 : getActualIdleTimeout();
+	const unsigned int timeout = clear ? 0 : getActualIdleTimeout();
 	if (!timeout || hasActiveRequests())
 	{
 		if (att_idle_timer)
@@ -1187,7 +1187,7 @@ ProfilerManager* Attachment::getProfilerManager(thread_db* tdbb)
 
 ProfilerManager* Attachment::getActiveProfilerManagerForNonInternalStatement(thread_db* tdbb)
 {
-	const auto request = tdbb->getRequest();
+	const auto* request = tdbb->getRequest();
 
 	return isProfilerActive() && !request->hasInternalStatement() ?
 		getProfilerManager(tdbb) :

src/jrd/Attachment.h

@@ -753,7 +753,7 @@ class Attachment : public pool_alloc<type_att>
 	void signalShutdown(ISC_STATUS code);
 
 	void mergeStats(bool pageStatsOnly = false);
-	bool hasActiveRequests() const;
+	bool hasActiveRequests() const noexcept;
 
 	bool backupStateWriteLock(thread_db* tdbb, SSHORT wait);
 	void backupStateWriteUnLock(thread_db* tdbb);
@@ -843,7 +843,7 @@ class Attachment : public pool_alloc<type_att>
 		return user ? user->getUserName() : emptyName;
 	}
 
-	void setInitialOptions(thread_db* tdbb, DatabaseOptions& options, bool newDb);
+	void setInitialOptions(thread_db* tdbb, const DatabaseOptions& options, bool newDb);
 
 	const CoercionArray* getInitialBindings() const noexcept
 	{
@@ -863,7 +863,7 @@ class Attachment : public pool_alloc<type_att>
 	bool isProfilerActive();
 	void releaseProfilerManager(thread_db* tdbb);
 
-	JProvider* getProvider()
+	JProvider* getProvider() noexcept
 	{
 		fb_assert(att_provider);
 		return att_provider;
@@ -1015,7 +1015,7 @@ class AttachmentsRefHolder
 		}
 	}
 
-	bool hasData() const
+	bool hasData() const noexcept
 	{
 		return m_attachments.hasData();
 	}