Fix -Wparentheses in ExtDS

+ add noexcept

Author: mrotteveel

src/jrd/extds/ExtDS.cpp

@@ -297,8 +297,7 @@ int Manager::shutdown()
 
 Provider::Provider(const char* prvName) :
 	m_name(getPool()),
-	m_connections(getPool()),
-	m_flags(0)
+	m_connections(getPool())
 {
 	m_name = prvName;
 }
@@ -342,7 +341,7 @@ void Provider::generateDPB(thread_db* tdbb, ClumpletWriter& dpb,
 		attachment->att_user->populateDpb(dpb, false);
 	}
 
-	CharSet* const cs = INTL_charset_lookup(tdbb, attachment->att_charset);
+	const CharSet* const cs = INTL_charset_lookup(tdbb, attachment->att_charset);
 	if (cs) {
 		dpb.insertString(isc_dpb_lc_ctype, cs->getName());
 	}
@@ -842,7 +841,7 @@ void Connection::raise(const FbStatusVector* status, thread_db* /*tdbb*/, const
 }
 
 
-bool Connection::getWrapErrors(const ISC_STATUS* status)
+bool Connection::getWrapErrors(const ISC_STATUS* status) noexcept
 {
 	// Detect if connection is broken
 	switch (status[1])
@@ -1989,7 +1988,7 @@ void Statement::deallocate(thread_db* tdbb)
 
 enum TokenType {ttNone, ttWhite, ttComment, ttBrokenComment, ttString, ttParamMark, ttIdent, ttOther};
 
-static TokenType getToken(const char** begin, const char* end)
+static TokenType getToken(const char** begin, const char* end) noexcept
 {
 	TokenType ret = ttNone;
 	const char* p = *begin;
@@ -2239,7 +2238,7 @@ void Statement::setInParams(thread_db* tdbb, const MetaName* const* names,
 	const FB_SIZE_T excCount = in_excess ? in_excess->getCount() : 0;
 	const FB_SIZE_T sqlCount = m_sqlParamNames.getCount();
 
-	if (m_error = (!names && sqlCount))
+	if ((m_error = (!names && sqlCount)))
 	{
 		// Parameter name expected
 		ERR_post(Arg::Gds(isc_eds_prm_name_expected));

src/jrd/extds/ExtDS.h

@@ -73,7 +73,7 @@ class CryptHash
 
 	void assign(Firebird::ICryptKeyCallback* callback);
 
-	bool isValid() const
+	bool isValid() const noexcept
 	{
 		return m_valid;
 	}
@@ -85,7 +85,7 @@ class CryptHash
 		return m_value.begin();
 	}
 
-	int getLength() const
+	int getLength() const noexcept
 	{
 		return isValid() ? m_value.getCount() : -1;
 	}
@@ -108,7 +108,7 @@ class CryptCallbackRedirector :
 		void resetRedirect(Firebird::ICryptKeyCallback* newCallback);
 		bool operator==(const CryptHash& h) const;
 
-		bool isValid() const
+		bool isValid() const noexcept
 		{
 			return m_hash.isValid();
 		}
@@ -203,17 +203,17 @@ class Provider : public Firebird::GlobalStorage
 	// cancel execution of every connection
 	void cancelConnections();
 
-	const Firebird::string& getName() const { return m_name; }
+	const Firebird::string& getName() const noexcept { return m_name; }
 
 	virtual void initialize() = 0;
 
 	// Provider properties
-	int getFlags() const { return m_flags; }
+	int getFlags() const noexcept { return m_flags; }
 
 	// Interprete status and put error description into passed string
 	virtual void getRemoteError(const Jrd::FbStatusVector* status, Firebird::string& err) const = 0;
 
-	static const Firebird::string* generate(const Provider* item)
+	static const Firebird::string* generate(const Provider* item) noexcept
 	{
 		return &item->m_name;
 	}
@@ -228,34 +228,34 @@ class Provider : public Firebird::GlobalStorage
 		const Firebird::string& role) const;
 
 	// Protection against simultaneous attach database calls. Not sure we still
-	// need it, but i believe it will not harm
-	Firebird::Mutex m_mutex;
+	// need it, but I believe it will not harm
+	mutable Firebird::Mutex m_mutex;
 
 	Firebird::string m_name;
-	Provider* m_next;
+	Provider* m_next = nullptr;
 
 	class AttToConn
 	{
 	public:
 		Jrd::Attachment* m_att;
 		Connection* m_conn;
 
-		AttToConn()
+		AttToConn() noexcept
 			: m_att(NULL),
 			  m_conn(NULL)
 		{}
 
-		AttToConn(Jrd::Attachment* att, Connection* conn)
+		AttToConn(Jrd::Attachment* att, Connection* conn) noexcept
 			: m_att(att),
 			  m_conn(conn)
 		{}
 
-		static const AttToConn& generate(const void*, const AttToConn& item)
+		static const AttToConn& generate(const void*, const AttToConn& item) noexcept
 		{
 			return item;
 		}
 
-		static bool greaterThan(const AttToConn& i1, const AttToConn& i2)
+		static bool greaterThan(const AttToConn& i1, const AttToConn& i2) noexcept
 		{
 			return (i1.m_att > i2.m_att) ||
 				(i1.m_att == i2.m_att && i1.m_conn > i2.m_conn);
@@ -266,7 +266,7 @@ class Provider : public Firebird::GlobalStorage
 		AttToConnMap;
 
 	AttToConnMap m_connections;
-	int m_flags;
+	int m_flags = 0;
 };
 
 // Provider flags
@@ -292,13 +292,13 @@ class ConnectionsPool
 	// clear connection relation with pool
 	void delConnection(Jrd::thread_db* tdbb, Connection* conn, bool destroy);
 
-	ULONG getIdleCount() const { return m_idleArray.getCount(); }
-	ULONG getAllCount() const { return m_allCount; } ;
+	ULONG getIdleCount() const noexcept { return m_idleArray.getCount(); }
+	ULONG getAllCount() const noexcept { return m_allCount; }
 
-	ULONG getMaxCount() const { return m_maxCount; }
+	ULONG getMaxCount() const noexcept { return m_maxCount; }
 	void setMaxCount(ULONG val);
 
-	ULONG getLifeTime() const	{ return m_lifeTime; }
+	ULONG getLifeTime() const noexcept { return m_lifeTime; }
 	void setLifeTime(ULONG val);
 
 	// delete idle connections: all or older than lifetime
@@ -319,20 +319,23 @@ class ConnectionsPool
 	{
 	public:
 		// constructor for embedded into Connection instance
-		explicit Data(Connection* conn)
+		explicit Data(Connection* conn) noexcept
 		{
 			clear();
 			m_conn = conn;
 		}
 
-		ConnectionsPool* getConnPool() const { return m_connPool; }
+		Data(const Data&) = delete;
+		Data& operator=(const Data&) = delete;
+
+		ConnectionsPool* getConnPool() const noexcept { return m_connPool; }
 
-		static const Data& generate(const Data* item)
+		static const Data& generate(const Data* item) noexcept
 		{
 			return *item;
 		}
 
-		static bool greaterThan(const Data& i1, const Data& i2)
+		static bool greaterThan(const Data& i1, const Data& i2) noexcept
 		{
 			if (i1.m_hash == i2.m_hash)
 			{
@@ -357,19 +360,16 @@ class ConnectionsPool
 		Data* m_next;
 		Data* m_prev;
 
-		Data(const Data&);
-		Data& operator=(const Data&);
-
 		// create instance used to search for recently used connection by hash
-		explicit Data(ULONG hash)
+		explicit Data(ULONG hash) noexcept
 		{
 			clear();
 			m_conn = NULL;
 			m_hash = hash;
 			m_lastUsed = MAX_SINT64;
 		}
 
-		void clear()
+		void clear() noexcept
 		{
 			m_connPool = NULL;
 			// m_conn = NULL;
@@ -497,15 +497,15 @@ class Connection : public Firebird::PermanentStorage
 		m_cryptCallbackRedir.setRedirect(attCallback);
 	}
 
-	void setBoundAtt(Jrd::Attachment* att) { m_boundAtt = att; }
+	void setBoundAtt(Jrd::Attachment* att) noexcept { m_boundAtt = att; }
 
 public:
-	Provider* getProvider() { return &m_provider; }
+	Provider* getProvider() noexcept { return &m_provider; }
 
-	Jrd::Attachment* getBoundAtt() const { return m_boundAtt; }
+	Jrd::Attachment* getBoundAtt() const noexcept { return m_boundAtt; }
 
-	ConnectionsPool* getConnPool() { return m_poolData.getConnPool(); }
-	ConnectionsPool::Data* getPoolData() { return &m_poolData; }
+	ConnectionsPool* getConnPool() noexcept { return m_poolData.getConnPool(); }
+	ConnectionsPool::Data* getPoolData() noexcept { return &m_poolData; }
 
 	virtual void attach(Jrd::thread_db* tdbb) = 0;
 	virtual void detach(Jrd::thread_db* tdbb);
@@ -515,7 +515,7 @@ class Connection : public Firebird::PermanentStorage
 	// Try to reset connection, return true if it can be pooled
 	virtual bool resetSession(Jrd::thread_db* tdbb) = 0;
 
-	int getSqlDialect() const { return m_sqlDialect; }
+	int getSqlDialect() const noexcept { return m_sqlDialect; }
 
 	// Is this connections can be used by current needs ? Not every DBMS
 	// allows to use same connection in more than one transaction and\or
@@ -532,7 +532,7 @@ class Connection : public Firebird::PermanentStorage
 	// only Internal provider is able to create "current" connections
 	virtual bool isCurrent() const { return false; }
 
-	bool isBroken() const
+	bool isBroken() const noexcept
 	{
 		return m_broken;
 	}
@@ -550,8 +550,8 @@ class Connection : public Firebird::PermanentStorage
 	void raise(const Jrd::FbStatusVector* status, Jrd::thread_db* tdbb, const char* sWhere);
 
 	// will we wrap external errors into our ones (isc_eds_xxx) or pass them as is
-	bool getWrapErrors(const ISC_STATUS* status);
-	void setWrapErrors(bool val) { m_wrapErrors = val; }
+	bool getWrapErrors(const ISC_STATUS* status) noexcept;
+	void setWrapErrors(bool val) noexcept { m_wrapErrors = val; }
 
 	// Transactions management within connection scope : put newly created
 	// transaction into m_transactions array and delete not needed transaction
@@ -569,18 +569,18 @@ class Connection : public Firebird::PermanentStorage
 	virtual Blob* createBlob() = 0;
 
 	// Test specified feature flag
-	bool testFeature(info_features value) const { return m_features[value]; }
+	bool testFeature(info_features value) const noexcept { return m_features[value]; }
 	// Set specified flag
-	void setFeature(info_features value) { m_features[value] = true; }
+	void setFeature(info_features value) noexcept { m_features[value] = true; }
 	// Clear specified flag
-	void clearFeature(info_features value) { m_features[value] = false; }
+	void clearFeature(info_features value) noexcept { m_features[value] = false; }
 
 	void resetRedirect(Firebird::ICryptKeyCallback* originalCallback)
 	{
 		m_cryptCallbackRedir.resetRedirect(originalCallback);
 	}
 
-	bool hasValidCryptCallback() const
+	bool hasValidCryptCallback() const noexcept
 	{
 		return m_cryptCallbackRedir.isValid();
 	}
@@ -631,11 +631,11 @@ class Transaction : public Firebird::PermanentStorage
 
 public:
 
-	Provider* getProvider() { return &m_provider; }
+	Provider* getProvider() noexcept { return &m_provider; }
 
-	Connection* getConnection() { return &m_connection; }
+	Connection* getConnection() noexcept { return &m_connection; }
 
-	TraScope getScope() const { return m_scope; }
+	TraScope getScope() const noexcept { return m_scope; }
 
 	virtual void start(Jrd::thread_db* tdbb, TraScope traScope, TraModes traMode,
 		bool readOnly, bool wait, int lockTimeout);
@@ -684,11 +684,11 @@ class Statement : public Firebird::PermanentStorage
 public:
 	static void deleteStatement(Jrd::thread_db* tdbb, Statement* stmt);
 
-	Provider* getProvider() { return &m_provider; }
+	Provider* getProvider() noexcept { return &m_provider; }
 
-	Connection* getConnection() { return &m_connection; }
+	Connection* getConnection() noexcept { return &m_connection; }
 
-	Transaction* getTransaction() { return m_transaction; }
+	Transaction* getTransaction() noexcept { return m_transaction; }
 
 	void prepare(Jrd::thread_db* tdbb, Transaction* tran, const Firebird::string& sql, bool named);
 	void setTimeout(Jrd::thread_db* tdbb, unsigned int timeout);
@@ -702,19 +702,19 @@ class Statement : public Firebird::PermanentStorage
 	void close(Jrd::thread_db* tdbb, bool invalidTran = false);
 	void deallocate(Jrd::thread_db* tdbb);
 
-	const Firebird::string& getSql() const { return m_sql; }
+	const Firebird::string& getSql() const noexcept { return m_sql; }
 
-	void setCallerPrivileges(bool use) { m_callerPrivileges = use; }
+	void setCallerPrivileges(bool use) noexcept { m_callerPrivileges = use; }
 
-	bool isActive() const { return m_active; }
+	bool isActive() const noexcept { return m_active; }
 
-	bool isAllocated() const { return m_allocated; }
+	bool isAllocated() const noexcept { return m_allocated; }
 
-	bool isSelectable() const { return m_stmt_selectable; }
+	bool isSelectable() const noexcept { return m_stmt_selectable; }
 
-	unsigned int getInputs() const { return m_inputs; }
+	unsigned int getInputs() const noexcept { return m_inputs; }
 
-	unsigned int getOutputs() const { return m_outputs; }
+	unsigned int getOutputs() const noexcept { return m_outputs; }
 
 	// Get error description from provider and put it with additional contex
 	// info into locally raised exception