Skip to content

rework StreamString::write to use String internal buffer direct. #1295

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 23, 2015
Merged

rework StreamString::write to use String internal buffer direct. #1295

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50ad8cc
rework StreamString::write to use String internal buffer direct.
Links2004 Dec 23, 2015
982ef45
Merge remote-tracking branch 'remotes/esp8266/master'
Links2004 Dec 23, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions cores/esp8266/StreamString.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,14 @@
#include <Arduino.h>
#include "StreamString.h"

size_t StreamString::write(const uint8_t *buffer, size_t size) {
if(reserve(length() + size + 1)) {
const uint8_t *s = buffer;
const uint8_t *end = buffer + size;
while(write(*s++) && s < end);
return s - buffer;
size_t StreamString::write(const uint8_t *data, size_t size) {
if(size && data) {
if(reserve(length() + size + 1)) {
memcpy((void *) (buffer + len), (const void *) data, size);
len += size;
*(buffer + len) = 0x00; // add null for string end
return size;
}
}
return 0;
}
Expand Down