noisymime
/
Arduino
mirror of https://github.com/noisymime/Arduino.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed indentation in Stream.cpp, no code change

This commit is contained in:
Cristian Maglie 2015-04-21 18:10:32 +02:00
parent 35fc66c23d
commit c96c917dd0
1 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hardware/arduino/avr/cores/arduino/Stream.cpp
View File

@ -254,9 +254,10 @@ String Stream::readStringUntil(char terminator)
int Stream::findMulti( struct Stream::MultiTarget *targets, int tCount) { int Stream::findMulti( struct Stream::MultiTarget *targets, int tCount) {
// any zero length target string automatically matches and would make // any zero length target string automatically matches and would make
// a mess of the rest of the algorithm. // a mess of the rest of the algorithm.
for (struct MultiTarget *t = targets; t < targets+tCount; ++t) for (struct MultiTarget *t = targets; t < targets+tCount; ++t) {
if (t->len <= 0) if (t->len <= 0)
return t - targets; return t - targets;
}
while (1) { while (1) {
int c = timedRead(); int c = timedRead();
@ -295,15 +296,18 @@ int Stream::findMulti( struct Stream::MultiTarget *targets, int tCount) {
// otherwise we need to check the rest of the found string // otherwise we need to check the rest of the found string
int diff = origIndex - t->index; int diff = origIndex - t->index;
size_t i; size_t i;
for (i = 0; i < t->index; ++i) for (i = 0; i < t->index; ++i) {
if (t->str[i] != t->str[i + diff]) if (t->str[i] != t->str[i + diff])
break; break;
}
// if we successfully got through the previous loop then our current // if we successfully got through the previous loop then our current
// index is good. // index is good.
if (i == t->index) { if (i == t->index) {
t->index++; t->index++;
break; break;
} }
// otherwise we just try the next index // otherwise we just try the next index
} while (t->index); } while (t->index);
} }