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

Merge pull request #2190 from ribbons/compiler-warnings 

Fix two compiler warnings generated by updated toolchain
This commit is contained in:
Cristian Maglie 2014-07-19 09:35:58 +02:00
parent e5c7cb9de1 61a3558946
commit dbd9b77b49
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 // find returns true if the target string is found
bool Stream::find(char *target) bool Stream::find(char *target)
{ {
return findUntil(target, ""); return findUntil(target, (char*)"");
} }
// reads data from the stream until the target string of given length is found // reads data from the stream until the target string of given length is found

2
hardware/arduino/sam/cores/arduino/Stream.cpp
View File

@ -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 // find returns true if the target string is found
bool Stream::find(char *target) bool Stream::find(char *target)
{ {
return findUntil(target, ""); return findUntil(target, (char*)"");
} }
// reads data from the stream until the target string of given length is found // reads data from the stream until the target string of given length is found

2
libraries/Ethernet/src/utility/socket.cpp
View File

@ -319,7 +319,6 @@ void flush(SOCKET s) {
uint16_t igmpsend(SOCKET s, const uint8_t * buf, uint16_t len) uint16_t igmpsend(SOCKET s, const uint8_t * buf, uint16_t len)
{ {
uint8_t status=0;
uint16_t ret=0; uint16_t ret=0;
if (len > W5100.SSIZE) if (len > W5100.SSIZE)
@ -335,7 +334,6 @@ uint16_t igmpsend(SOCKET s, const uint8_t * buf, uint16_t len)
while ( (W5100.readSnIR(s) & SnIR::SEND_OK) != SnIR::SEND_OK ) while ( (W5100.readSnIR(s) & SnIR::SEND_OK) != SnIR::SEND_OK )
{ {
status = W5100.readSnSR(s);
if (W5100.readSnIR(s) & SnIR::TIMEOUT) if (W5100.readSnIR(s) & SnIR::TIMEOUT)
{ {
/* in case of igmp, if send fails, then socket closed */ /* in case of igmp, if send fails, then socket closed */