Merge tag 'v0.20.9'

release v0.20.9

src/lib/curl/Global.cxx

@@ -63,7 +63,7 @@ public:
 	 */
 	static int SocketFunction(CURL *easy,
 				  curl_socket_t s, int action,
-				  void *userp, void *socketp);
+				  void *userp, void *socketp) noexcept;
 
 	virtual bool OnSocketReady(unsigned flags) override;
 
@@ -75,7 +75,7 @@ private:
 	}
 
 	gcc_const
-	static unsigned CurlPollToFlags(int action) {
+	static unsigned CurlPollToFlags(int action) noexcept {
 		switch (action) {
 		case CURL_POLL_NONE:
 			return 0;
@@ -108,7 +108,7 @@ CurlGlobal::CurlGlobal(EventLoop &_loop)
 int
 CurlSocket::SocketFunction(gcc_unused CURL *easy,
 			   curl_socket_t s, int action,
-			   void *userp, void *socketp) {
+			   void *userp, void *socketp) noexcept {
 	auto &global = *(CurlGlobal *)userp;
 	CurlSocket *cs = (CurlSocket *)socketp;
 

src/lib/nfs/Connection.hxx

@@ -147,16 +147,16 @@ public:
 	~NfsConnection();
 
 	gcc_pure
-	const char *GetServer() const {
+	const char *GetServer() const noexcept {
 		return server.c_str();
 	}
 
 	gcc_pure
-	const char *GetExportName() const {
+	const char *GetExportName() const noexcept {
 		return export_name.c_str();
 	}
 
-	EventLoop &GetEventLoop() {
+	EventLoop &GetEventLoop() noexcept {
 		return SocketMonitor::GetEventLoop();
 	}
 

src/lib/upnp/ContentDirectoryService.hxx

@@ -114,12 +114,12 @@ public:
 	std::list<std::string> getSearchCapabilities(UpnpClient_Handle handle) const;
 
 	gcc_pure
-	std::string GetURI() const {
+	std::string GetURI() const noexcept {
 		return "upnp://" + m_deviceId + "/" + m_serviceType;
 	}
 
 	/** Retrieve the "friendly name" for this server, useful for display. */
-	const char *getFriendlyName() const {
+	const char *getFriendlyName() const noexcept {
 		return m_friendlyName.c_str();
 	}
 };