arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-16 11:21:18 +03:00
Code Activity

An improved patch for the Client part of issue 416 (adding a multi-byte read). This one moves all of the checking into recv, so that single-byte reads also benefit. It also returns -1 if there's no data available unless we've reached EOF, in which case it returns 0.

Browse Source
This commit is contained in:
amcewen
2011-01-02 22:21:24 +00:00
parent bc0f3c4fe1
commit 81b6c69f29
3 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
libraries/Ethernet/Client.cpp
View File

@ -77,14 +77,25 @@ int Client::available() {
int Client::read() {
uint8_t b;
if (!available())
if ( recv(_sock, &b, 1) )
{
// recv worked
return b;
}
else
{
// No data available
return -1;
recv(_sock, &b, 1);
return b;
}
}
int Client::read(uint8_t *buf, size_t size) {
return recv(_sock, buf, size);
}
int Client::peek() {
uint8_t b;
// Unlike recv, peek doesn't check to see if there's any data available, so we must
if (!available())
return -1;
::peek(_sock, &b);