less ram usage when using strings

Links2004 · Links2004 · commit 2d87bfa3d60a · 2016-02-06T19:21:24.000+01:00
diff --git a/src/WebSockets.cpp b/src/WebSockets.cpp
@@ -473,7 +473,7 @@ void WebSockets::handleWebsocketPayloadCb(WSclient_t * client, bool ok, uint8_t
  * @param clientKey String
  * @return String Accept Key
  */
-String WebSockets::acceptKey(String clientKey) {
+String WebSockets::acceptKey(String & clientKey) {
     uint8_t sha1HashBin[20] = { 0 };
 #ifdef ESP8266
     sha1(clientKey + "258EAFA5-E914-47DA-95CA-C5AB0DC85B11", &sha1HashBin[0]);
diff --git a/src/WebSockets.h b/src/WebSockets.h
@@ -212,7 +212,7 @@ class WebSockets {
         void handleWebsocketCb(WSclient_t * client);
         void handleWebsocketPayloadCb(WSclient_t * client, bool ok, uint8_t * payload);
 
-        String acceptKey(String clientKey);
+        String acceptKey(String & clientKey);
         String base64_encode(uint8_t * data, size_t length);
 
         bool readCb(WSclient_t * client, uint8_t *out, size_t n, WSreadWaitCb cb);
diff --git a/src/WebSocketsClient.cpp b/src/WebSocketsClient.cpp
@@ -171,7 +171,7 @@ void WebSocketsClient::sendTXT(const char * payload, size_t length) {
     sendTXT((uint8_t *) payload, length);
 }
 
-void WebSocketsClient::sendTXT(String payload) {
+void WebSocketsClient::sendTXT(String & payload) {
     sendTXT((uint8_t *) payload.c_str(), payload.length());
 }
 
diff --git a/src/WebSocketsClient.h b/src/WebSocketsClient.h
@@ -61,7 +61,7 @@ class WebSocketsClient: private WebSockets {
         void sendTXT(const uint8_t * payload, size_t length = 0);
         void sendTXT(char * payload, size_t length = 0, bool headerToPayload = false);
         void sendTXT(const char * payload, size_t length = 0);
-        void sendTXT(String payload);
+        void sendTXT(String & payload);
 
         void sendBIN(uint8_t * payload, size_t length, bool headerToPayload = false);
         void sendBIN(const uint8_t * payload, size_t length);
diff --git a/src/WebSocketsServer.cpp b/src/WebSocketsServer.cpp
@@ -148,7 +148,7 @@ void WebSocketsServer::sendTXT(uint8_t num, const char * payload, size_t length)
     sendTXT(num, (uint8_t *) payload, length);
 }
 
-void WebSocketsServer::sendTXT(uint8_t num, String payload) {
+void WebSocketsServer::sendTXT(uint8_t num, String & payload) {
     sendTXT(num, (uint8_t *) payload.c_str(), payload.length());
 }
 
@@ -187,7 +187,7 @@ void WebSocketsServer::broadcastTXT(const char * payload, size_t length) {
     broadcastTXT((uint8_t *) payload, length);
 }
 
-void WebSocketsServer::broadcastTXT(String payload) {
+void WebSocketsServer::broadcastTXT(String & payload) {
     broadcastTXT((uint8_t *) payload.c_str(), payload.length());
 }
 
diff --git a/src/WebSocketsServer.h b/src/WebSocketsServer.h
@@ -61,13 +61,13 @@ class WebSocketsServer: private WebSockets {
         void sendTXT(uint8_t num, const uint8_t * payload, size_t length = 0);
         void sendTXT(uint8_t num, char * payload, size_t length = 0, bool headerToPayload = false);
         void sendTXT(uint8_t num, const char * payload, size_t length = 0);
-        void sendTXT(uint8_t num, String payload);
+        void sendTXT(uint8_t num, String & payload);
 
         void broadcastTXT(uint8_t * payload, size_t length = 0, bool headerToPayload = false);
         void broadcastTXT(const uint8_t * payload, size_t length = 0);
         void broadcastTXT(char * payload, size_t length = 0, bool headerToPayload = false);
         void broadcastTXT(const char * payload, size_t length = 0);
-        void broadcastTXT(String payload);
+        void broadcastTXT(String & payload);
 
         void sendBIN(uint8_t num, uint8_t * payload, size_t length, bool headerToPayload = false);
         void sendBIN(uint8_t num, const uint8_t * payload, size_t length);

Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ void WebSocketsClient::sendTXT(const char * payload, size_t length) {`
`171`	`171`	`sendTXT((uint8_t *) payload, length);`
`172`	`172`	`}`
`173`	`173`
`174`		`-void WebSocketsClient::sendTXT(String payload) {`
	`174`	`+void WebSocketsClient::sendTXT(String & payload) {`
`175`	`175`	`sendTXT((uint8_t *) payload.c_str(), payload.length());`
`176`	`176`	`}`
`177`	`177`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ void WebSocketsServer::sendTXT(uint8_t num, const char * payload, size_t length)`
`148`	`148`	`sendTXT(num, (uint8_t *) payload, length);`
`149`	`149`	`}`
`150`	`150`
`151`		`-void WebSocketsServer::sendTXT(uint8_t num, String payload) {`
	`151`	`+void WebSocketsServer::sendTXT(uint8_t num, String & payload) {`
`152`	`152`	`sendTXT(num, (uint8_t *) payload.c_str(), payload.length());`
`153`	`153`	`}`
`154`	`154`
`@@ -187,7 +187,7 @@ void WebSocketsServer::broadcastTXT(const char * payload, size_t length) {`
`187`	`187`	`broadcastTXT((uint8_t *) payload, length);`
`188`	`188`	`}`
`189`	`189`
`190`		`-void WebSocketsServer::broadcastTXT(String payload) {`
	`190`	`+void WebSocketsServer::broadcastTXT(String & payload) {`
`191`	`191`	`broadcastTXT((uint8_t *) payload.c_str(), payload.length());`
`192`	`192`	`}`
`193`	`193`