4 files changed, 8 insertions, 9 deletions
diff --git a/src/client/Client.cxx b/src/client/Client.cxx
index 3819c6584..922e901ab 100644
--- a/src/client/Client.cxx
+++ b/src/client/Client.cxx
@@ -46,7 +46,7 @@ Client::GetPlayerControl()
 #ifdef ENABLE_DATABASE
 
 const Database *
-Client::GetDatabase() const
+Client::GetDatabase() const noexcept
 {
 	return partition->instance.GetDatabase();
 }
@@ -58,7 +58,7 @@ Client::GetDatabaseOrThrow() const
 }
 
 const Storage *
-Client::GetStorage() const
+Client::GetStorage() const noexcept
 {
 	return partition->instance.storage;
 }
diff --git a/src/client/Client.hxx b/src/client/Client.hxx
index 67cd1cfe0..762eccd18 100644
--- a/src/client/Client.hxx
+++ b/src/client/Client.hxx
@@ -166,7 +166,7 @@ public:
 	};
 
 	gcc_pure
-	bool IsSubscribed(const char *channel_name) const {
+	bool IsSubscribed(const char *channel_name) const noexcept {
 		return subscriptions.find(channel_name) != subscriptions.end();
 	}
 
@@ -211,16 +211,15 @@ public:
 	 * Wrapper for Instance::GetDatabase().
 	 */
 	gcc_pure
-	const Database *GetDatabase() const;
+	const Database *GetDatabase() const noexcept;
 
 	/**
 	 * Wrapper for Instance::GetDatabaseOrThrow().
 	 */
-	gcc_pure
 	const Database &GetDatabaseOrThrow() const;
 
 	gcc_pure
-	const Storage *GetStorage() const;
+	const Storage *GetStorage() const noexcept;
 
 private:
 	/* virtual methods from class BufferedSocket */
diff --git a/src/client/ClientMessage.cxx b/src/client/ClientMessage.cxx
index 145f706dd..da45fe643 100644
--- a/src/client/ClientMessage.cxx
+++ b/src/client/ClientMessage.cxx
@@ -23,14 +23,14 @@
 
 gcc_const
 static bool
-valid_channel_char(const char ch)
+valid_channel_char(const char ch) noexcept
 {
 	return IsAlphaNumericASCII(ch) ||
 		ch == '_' || ch == '-' || ch == '.' || ch == ':';
 }
 
 bool
-client_message_valid_channel_name(const char *name)
+client_message_valid_channel_name(const char *name) noexcept
 {
 	do {
 		if (!valid_channel_char(*name))
diff --git a/src/client/ClientMessage.hxx b/src/client/ClientMessage.hxx
index aef914dd7..b665cd65e 100644
--- a/src/client/ClientMessage.hxx
+++ b/src/client/ClientMessage.hxx
@@ -53,6 +53,6 @@ public:
 
 gcc_pure
 bool
-client_message_valid_channel_name(const char *name);
+client_message_valid_channel_name(const char *name) noexcept;
 
 #endif