rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-02-11 05:54:16 +01:00
Code Issues Releases Activity

Merge pull request #3011 from Lauszus/warnings

Browse Source 
Fixed some warnings
This commit is contained in:
Cristian Maglie 2015-04-21 08:54:41 +02:00
commit 6a22efef7c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -265,11 +265,11 @@ int Stream::findMulti( struct Stream::MultiTarget *targets, int tCount) {
for (struct MultiTarget *t = targets; t < targets+tCount; ++t) { for (struct MultiTarget *t = targets; t < targets+tCount; ++t) {
// the simple case is if we match, deal with that first. // the simple case is if we match, deal with that first.
if (c == t->str[t->index]) if (c == t->str[t->index]) {
if (++t->index == t->len) if (++t->index == t->len)
return t - targets; return t - targets;
else } else
continue; continue;
// if not we need to walk back and see if we could have matched further // if not we need to walk back and see if we could have matched further
// down the stream (ie '1112' doesn't match the first position in '11112' // down the stream (ie '1112' doesn't match the first position in '11112'
@ -293,7 +293,7 @@ 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;
int 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;