Avoid unnecessary cast to String in API

homieiot · Feb 5, 2016 · 00c95b8 · 00c95b8
1 parent ce61fa2
commit 00c95b8
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/src/Homie.cpp b/src/Homie.cpp
@@ -77,7 +77,7 @@ void HomieClass::setResetHook(void (*callback)(void)) {
   this->_shared_interface.resetHook = callback;
 }
 
-bool HomieClass::setNodeProperty(HomieNode& node, String property, String value, bool retained) {
+bool HomieClass::setNodeProperty(HomieNode& node, const char* property, const char* value, bool retained) {
   if (!this->isReadyToOperate()) {
     return false;
   }
@@ -88,7 +88,7 @@ bool HomieClass::setNodeProperty(HomieNode& node, String property, String value,
   topic += node.id;
   topic += "/";
   topic += property;
-  return this->_shared_interface.mqtt->publish(topic.c_str(), value.c_str(), retained);
+  return this->_shared_interface.mqtt->publish(topic.c_str(), value, retained);
 }
 
 HomieClass Homie;
diff --git a/src/Homie.h b/src/Homie.h
@@ -31,10 +31,10 @@ namespace HomieInternals {
       void setSetupFunction(void (*callback)(void));
       void setLoopFunction(void (*callback)(void));
       bool isReadyToOperate();
-      bool setNodeProperty(HomieNode& node, const char* property, const char* value, bool retained = true) {
-        this->setNodeProperty(node, String(property), String(value), retained);
+      bool setNodeProperty(HomieNode& node, String property, String value, bool retained = true) {
+        this->setNodeProperty(node, property.c_str(), value.c_str(), retained);
       }
-      bool setNodeProperty(HomieNode& node, String property, String value, bool retained = true);
+      bool setNodeProperty(HomieNode& node, const char* property, const char* value, bool retained = true);
     private:
       Boot* _boot;
       SharedInterface _shared_interface;

diff --git a/src/Homie/Logger.cpp b/src/Homie/Logger.cpp
@@ -11,13 +11,13 @@ void LoggerClass::setLogging(bool enable) {
   this->_logging_enabled = enable;
 }
 
-void LoggerClass::log(String text) {
+void LoggerClass::log(const char* text) {
   if (this->_logging_enabled) {
     Serial.print(text);
   }
 }
 
-void LoggerClass::logln(String text) {
+void LoggerClass::logln(const char* text) {
   if (this->_logging_enabled) {
     Serial.println(text);
   }

diff --git a/src/Homie/Logger.hpp b/src/Homie/Logger.hpp
@@ -7,14 +7,14 @@ namespace HomieInternals {
     public:
       LoggerClass();
       void setLogging(bool enable);
-      void log(const char* text) {
-        this->log(String(text));
+      void log(String text) {
+        this->log(text.c_str());
       }
-      void log(String text);
-      void logln(const char* text = "") {
-        this->logln(String(text));
+      void log(const char* text);
+      void logln(String text) {
+        this->logln(text.c_str());
       }
-      void logln(String text);
+      void logln(const char* text = "");
 
     private:
       bool _logging_enabled;