Skip to content

Commit 6a1cea1

Browse files
committed
rename count parameter to untilTotalNumberOfOccurrences
1 parent e624b56 commit 6a1cea1

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

cores/esp8266/Stream.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -262,10 +262,10 @@ String Stream::readStringUntil(char terminator) {
262262
return ret;
263263
}
264264

265-
String Stream::readStringUntil(const char* terminator, uint32_t count) {
265+
String Stream::readStringUntil(const char* terminator, uint32_t untilTotalNumberOfOccurrences) {
266266
String ret;
267267
int c;
268-
uint32_t termCount = 0;
268+
uint32_t occurrences = 0;
269269
size_t termLen = strlen(terminator);
270270
size_t termIndex = 0;
271271
size_t index = 0;
@@ -275,7 +275,7 @@ String Stream::readStringUntil(const char* terminator, uint32_t count) {
275275
index++;
276276

277277
if (terminator[termIndex] == c) {
278-
if (++termIndex == termLen && ++termCount == count) {
278+
if (++termIndex == termLen && ++occurrences == untilTotalNumberOfOccurrences) {
279279
// don't include terminator in returned string
280280
ret.remove(index - termIndex, termLen);
281281
break;

cores/esp8266/Stream.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ class Stream: public Print {
115115
// Arduino String functions to be added here
116116
virtual String readString();
117117
String readStringUntil(char terminator);
118-
String readStringUntil(const char* terminator, uint32_t count = 1);
118+
String readStringUntil(const char* terminator, uint32_t untilTotalNumberOfOccurrences = 1);
119119

120120
virtual int read (uint8_t* buffer, size_t len);
121121
int read (char* buffer, size_t len) { return read((uint8_t*)buffer, len); }

0 commit comments

Comments
 (0)