Return object reference& instead of pointer (never null)

slaff · Nov 6, 2020 · 36fa814 · 36fa814
1 parent 97990e8
commit 36fa814
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/Sming/Libraries/DIAL/sample/app/application.cpp b/Sming/Libraries/DIAL/sample/app/application.cpp
@@ -42,7 +42,7 @@ void onConnected(Dial::Client& client, const XML::Document& doc, const HttpHeade
 		Serial.printf(_F("Friendly name: %s.\n"), node->value());
 	}
 
-	auto app = client.getApp("YouTube");
+	auto& app = client.getApp("YouTube");
 	app.status(onStatus);
 }
 

diff --git a/Sming/Libraries/DIAL/src/Dial/Client.cpp b/Sming/Libraries/DIAL/src/Dial/Client.cpp
@@ -115,14 +115,14 @@ bool Client::connect(const Url& descriptionUrl, Connected callback)
 	return true;
 }
 
-App* Client::getApp(const String& applicationId)
+App& Client::getApp(const String& applicationId)
 {
 	auto app = apps[applicationId];
 	if(!app) {
 		app = new App(applicationId, applicationUrl);
 	}
 
-	return app;
+	return *app;
 }
 
 // EEEKK!!! Cannot do this - returns dangling pointer

diff --git a/Sming/Libraries/DIAL/src/Dial/Client.h b/Sming/Libraries/DIAL/src/Dial/Client.h
@@ -68,12 +68,12 @@ class Client : public UPnP::ControlPoint
 	void onNotify(SSDP::BasicMessage& msg) override;
 
 	/**
-	 * @brief Gets pointer to an application object
+	 * @brief Get application object by name
 	 * @param applicationId the unique application.
 	 * 				A list of registered ids can be found here: http://www.dial-multiscreen.org/dial-registry/namespace-database#TOC-Registered-Names
-	 * @retval pointer to an application obeject
+	 * @retval App& Application object reference
 	 */
-	App* getApp(const String& applicationId);
+	App& getApp(const String& applicationId);
 
 protected:
 	static HttpClient http;