10000 less ram usage when using strings · arnopoulos/arduinoWebSockets@2d87bfa · GitHub
[go: up one dir, main page]
Skip to content

Commit 2d87bfa

Browse files
Links2004Links2004
committed
less ram usage when using strings
1 parent 2b6f190 commit 2d87bfa

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

‎src/WebSockets.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@ void WebSockets::handleWebsocketPayloadCb(WSclient_t * client, bool ok, uint8_t
473473
* @param clientKey String
474474
* @return String Accept Key
475475
*/
476-
String WebSockets::acceptKey(String clientKey) {
476+
String WebSockets::acceptKey(String & clientKey) {
477477
uint8_t sha1HashBin[20] = { 0 };
478478
#ifdef ESP8266
479479
sha1(clientKey + "258EAFA5-E914-47DA-95CA-C5AB0DC85B11", &sha1HashBin[0]);

‎src/WebSockets.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ class WebSockets {
212212
void handleWebsocketCb(WSclient_t * client);
213213
void handleWebsocketPayloadCb(WSclient_t * client, bool ok, uint8_t * payload);
214214

215-
String acceptKey(String clientKey);
215+
String acceptKey(String & clientKey);
216216
String base64_encode(uint8_t * data, size_t length);
217217

218218
bool readCb(WSclient_t * client, uint8_t *out, size_t n, WSreadWaitCb cb);

‎src/WebSocketsClient.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ void WebSocketsClient::sendTXT(const char * payload, size_t length) {
171171
sendTXT((uint8_t *) payload, length);
172172
}
173173

174-
void WebSocketsClient::sendTXT(String payload) {
174+
void WebSocketsClient::sendTXT(String & payload) {
175175
sendTXT((uint8_t *) payload.c_str(), payload.length());
176176
}
177177

‎src/WebSocketsClient.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class WebSocketsClient: private WebSockets {
6161
void sendTXT(const uint8_t * payload, size_t length = 0);
6262
void sendTXT(char * payload, size_t length = 0, bool headerToPayload = false);
6363
void sendTXT(const char * payload, size_t length = 0);
64-
void sendTXT(String payload);
64+
void sendTXT(String & payload);
6565

6666
void sendBIN(uint8_t * payload, size_t length, bool headerToPayload = false);
6767
void sendBIN(const uint8_t * payload, size_t length);

‎src/WebSocketsServer.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ void WebSocketsServer::sendTXT(uint8_t num, const char * payload, size_t length)
148148
sendTXT(num, (uint8_t *) payload, length);
149149
}
150150

151-
void WebSocketsServer::sendTXT(uint8_t num, String payload) {
151+
void WebSocketsServer::sendTXT(uint8_t num, String & payload) {
152152
sendTXT(num, (uint8_t *) payload.c_str(), payload.length());
153153
}
154154

@@ -187,7 +187,7 @@ void WebSocketsServer::broadcastTXT(const char * payload, size_t length) {
187187
broadcastTXT((uint8_t *) payload, length);
188188
}
189189

190-
void WebSocketsServer::broadcastTXT(String payload) {
190+
void WebSocketsServer::broadcastTXT(String & payload) {
191191
broadcastTXT((uint8_t *) payload.c_str(), payload.length());
192192
}
193193

‎src/WebSocketsServer.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,13 @@ class WebSocketsServer: private WebSockets {
6161
void sendTXT(uint8_t num, const uint8_t * payload, size_t length = 0);
6262
void sendTXT(uint8_t num, char * payload, size_t length = 0, bool headerToPayload = false);
6363
void sendTXT(uint8_t num, const char * payload, size_t length = 0);
64-
void sendTXT(uint8_t num, String payload);
64+
void sendTXT(uint8_t num, String & payload);
6565

6666
void broadcastTXT(uint8_t * payload, size_t length = 0, bool headerToPayload = false);
6767
void broadcastTXT(const uint8_t * payload, size_t length = 0);
6868
void broadcastTXT(char * payload, size_t length = 0, bool headerToPayload = false);
6969
void broadcastTXT(const char * payload, size_t length = 0);
70-
void broadcastTXT(String payload);
70+
void broadcastTXT(String & payload);
7171

7272
void sendBIN(uint8_t num, uint8_t * payload, size_t length, bool headerToPayload = false);
7373
void sendBIN(uint8_t num, const uint8_t * payload, size_t length);

0 commit comments

Comments
 (0)
0