Flush client with single call to available

me-no-dev · me-no-dev · commit 8fb8478431a0 · 2017-03-03T14:56:18.000+02:00
diff --git a/libraries/WiFi/src/WiFiClient.cpp b/libraries/WiFi/src/WiFiClient.cpp
@@ -255,6 +255,7 @@ int WiFiClient::available()
 // Though flushing means to send all pending data,
 // seems that in Arduino it also means to clear RX
 void WiFiClient::flush() {
+    int res;
     size_t a = available(), toRead = 0;
     if(!a){
         return;//nothing to flush
@@ -265,12 +266,13 @@ void WiFiClient::flush() {
     }
     while(a){
         toRead = (a>WIFI_CLIENT_FLUSH_BUFFER_SIZE)?WIFI_CLIENT_FLUSH_BUFFER_SIZE:a;
-        if(recv(fd(), buf, toRead, MSG_DONTWAIT) < 0) {
+        res = recv(fd(), buf, toRead, MSG_DONTWAIT);
+        if(res < 0) {
             log_e("%d", errno);
             stop();
             break;
         }
-        a = available();
+        a -= res;
     }
     free(buf);
 }

Original file line number	Diff line number	Diff line change
`@@ -255,6 +255,7 @@ int WiFiClient::available()`
`255`	`255`	`// Though flushing means to send all pending data,`
`256`	`256`	`// seems that in Arduino it also means to clear RX`
`257`	`257`	`void WiFiClient::flush() {`
	`258`	`+ int res;`
`258`	`259`	`size_t a = available(), toRead = 0;`
`259`	`260`	`if(!a){`
`260`	`261`	`return;//nothing to flush`
`@@ -265,12 +266,13 @@ void WiFiClient::flush() {`
`265`	`266`	`}`
`266`	`267`	`while(a){`
`267`	`268`	`toRead = (a>WIFI_CLIENT_FLUSH_BUFFER_SIZE)?WIFI_CLIENT_FLUSH_BUFFER_SIZE:a;`
`268`		`- if(recv(fd(), buf, toRead, MSG_DONTWAIT) < 0) {`
	`269`	`+ res = recv(fd(), buf, toRead, MSG_DONTWAIT);`
	`270`	`+ if(res < 0) {`
`269`	`271`	`log_e("%d", errno);`
`270`	`272`	`stop();`
`271`	`273`	`break;`
`272`	`274`	`}`
`273`		`- a = available();`
	`275`	`+ a -= res;`
`274`	`276`	`}`
`275`	`277`	`free(buf);`
`276`	`278`	`}`