aboutsummaryrefslogtreecommitdiff
path: root/cores/arduino/Stream.cpp
diff options
context:
space:
mode:
authorCristian Maglie <c.maglie@bug.st>2014-06-13 10:29:12 +0200
committerCristian Maglie <c.maglie@bug.st>2014-06-13 10:29:12 +0200
commitfca64de38731aa111924a5488a3a56d44cf1b3a2 (patch)
tree5210af6ba828c22fe42f832a594b3e6720d599ab /cores/arduino/Stream.cpp
parent8bef5cdf0392f6a3a13e0f8ead92efeebfcf5aac (diff)
parent12219b37d5f4569649cd4dac247fbfcee5dfb79b (diff)
Merge branch 'master' into HEAD
Diffstat (limited to 'cores/arduino/Stream.cpp')
-rw-r--r--cores/arduino/Stream.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/cores/arduino/Stream.cpp b/cores/arduino/Stream.cpp
index a12a72e..39873aa 100644
--- a/cores/arduino/Stream.cpp
+++ b/cores/arduino/Stream.cpp
@@ -75,7 +75,7 @@ void Stream::setTimeout(unsigned long timeout) // sets the maximum number of mi
// find returns true if the target string is found
bool Stream::find(char *target)
{
- return findUntil(target, NULL);
+ return findUntil(target, "");
}
// reads data from the stream until the target string of given length is found