Client.h defined the read signature as 'int read(uint8_t *, size_t)'; rework all internal API's to match that

Author: GrumpyOldPizza

cores/arduino/CDC.cpp

@@ -143,7 +143,7 @@ int CDC::read()
     return data;
 }
 
-size_t CDC::read(uint8_t *buffer, size_t size)
+int CDC::read(uint8_t *buffer, size_t size)
 {
     return stm32l0_usbd_cdc_receive(_usbd_cdc, (uint8_t*)buffer, size, false);
 }

cores/arduino/Callback.h

@@ -30,9 +30,9 @@
 
 class Callback {
 public:
-    Callback() : _callback(NULL), _context(NULL) {  }
+    Callback() : _callback(NULL), _context(nullptr) {  }
 
-    Callback(void (*function)(void)) : _callback((void (*)(void*))function), _context(NULL) { }
+    Callback(void (*function)(void)) : _callback((void (*)(void*))function), _context(nullptr) { }
 
     template<typename T>
     Callback(void (T::*method)(), T *object) { bind(&method, object); }

cores/arduino/FS.cpp

@@ -118,7 +118,7 @@ int File::read() {
     return -1;
 }
 
-size_t File::read(uint8_t* data, size_t size) {
+int File::read(uint8_t* data, size_t size) {
     if (_handle) {
 	return _handle->read(data, size);
     }

cores/arduino/FS.h

@@ -65,7 +65,7 @@ class File : public Stream
     // Stream methods:
     int available() override;
     int read() override;
-    size_t read(uint8_t* data, size_t size) override;
+    int read(uint8_t* data, size_t size) override;
     int peek() override;
 
     // File methods

cores/arduino/HardwareSerial.h

@@ -47,7 +47,7 @@ class HardwareSerial : public Stream
     virtual int available(void) = 0;
     virtual int peek(void) = 0;
     virtual int read(void) = 0;
-    virtual size_t read(uint8_t *buffer, size_t size) = 0;
+    virtual int read(uint8_t *buffer, size_t size) = 0;
     virtual void flush(void) = 0;
     virtual size_t write(uint8_t) = 0;
     using Print::write; // pull in write(str) and write(buf, size) from Print

cores/arduino/Stream.cpp

@@ -27,7 +27,7 @@
 
 #define PARSE_TIMEOUT 1000  // default number of milli-seconds to wait
 
-size_t Stream::read(uint8_t *buffer, size_t size)
+int Stream::read(uint8_t *buffer, size_t size)
 {
   size_t count = 0;
 

cores/arduino/Stream.h

@@ -59,7 +59,7 @@ class Stream : public Print
   public:
     virtual int available() = 0;
     virtual int read() = 0;
-    virtual size_t read(uint8_t *buffer, size_t size);
+    virtual int read(uint8_t *buffer, size_t size);
     virtual int peek() = 0;
 
     Stream() {_timeout=1000;}

cores/arduino/USBAPI.h

@@ -66,7 +66,7 @@ class CDC : public HardwareSerial
     virtual int availableForWrite(void);
     virtual int peek(void);
     virtual int read(void);
-    virtual size_t read(uint8_t *buffer, size_t size);
+    virtual int read(uint8_t *buffer, size_t size);
     virtual void flush(void);
     virtual size_t write(uint8_t);
     virtual size_t write(const uint8_t *buffer, size_t size);

cores/arduino/Uart.cpp

@@ -143,7 +143,7 @@ int Uart::read()
     return data;
 }
 
-size_t Uart::read(uint8_t *buffer, size_t size)
+int Uart::read(uint8_t *buffer, size_t size)
 {
     return stm32l0_uart_receive(_uart, (uint8_t*)buffer, size, false);
 }

cores/arduino/Uart.h

@@ -52,7 +52,7 @@ class Uart : public HardwareSerial
     virtual int availableForWrite(void);
     virtual int peek();
     virtual int read();
-    virtual size_t read(uint8_t *buffer, size_t size);
+    virtual int read(uint8_t *buffer, size_t size);
     virtual void flush();
     virtual size_t write(const uint8_t data);
     virtual size_t write(const uint8_t *buffer, size_t size);

libraries/FskRadio/src/FskRadio.cpp

@@ -425,7 +425,7 @@ int FskRadioClass::read()
     return data;
 }
 
-size_t FskRadioClass::read(uint8_t *buffer, size_t size)
+int FskRadioClass::read(uint8_t *buffer, size_t size)
 {
     size_t count;
 

libraries/FskRadio/src/FskRadio.h

@@ -85,7 +85,7 @@ class FskRadioClass : public Stream
     int parsePacket();
     virtual int available();
     virtual int read();
-    virtual size_t read(uint8_t *buffer, size_t size);
+    virtual int read(uint8_t *buffer, size_t size);
     virtual int peek();
     virtual void purge();
 

libraries/LoRaRadio/src/LoRaRadio.cpp

@@ -397,7 +397,7 @@ int LoRaRadioClass::read()
     return data;
 }
 
-size_t LoRaRadioClass::read(uint8_t *buffer, size_t size)
+int LoRaRadioClass::read(uint8_t *buffer, size_t size)
 {
     size_t count;
 

libraries/LoRaRadio/src/LoRaRadio.h

@@ -94,7 +94,7 @@ class LoRaRadioClass : public Stream
     int parsePacket();
     virtual int available();
     virtual int read();
-    virtual size_t read(uint8_t *buffer, size_t size);
+    virtual int read(uint8_t *buffer, size_t size);
     virtual int peek();
     virtual void purge();
 

libraries/LoRaWAN/src/LoRaWAN.cpp

@@ -989,7 +989,7 @@ int LoRaWANClass::read()
     return data;
 }
 
-size_t LoRaWANClass::read(uint8_t *buffer, size_t size)
+int LoRaWANClass::read(uint8_t *buffer, size_t size)
 {
     size_t count;
 

libraries/LoRaWAN/src/LoRaWAN.h

@@ -148,7 +148,7 @@ class LoRaWANClass : public Stream
     int parsePacket();
     virtual int available();
     virtual int read();
-    virtual size_t read(uint8_t *buffer, size_t size);
+    virtual int read(uint8_t *buffer, size_t size);
     virtual int peek();
     virtual void flush();
     uint8_t remotePort();

libraries/Wire/src/Wire.cpp

@@ -275,7 +275,7 @@ int TwoWire::read(void)
     return _rx_data[_rx_read++];
 }
 
-size_t TwoWire::read(uint8_t *buffer, size_t size)
+int TwoWire::read(uint8_t *buffer, size_t size)
 {
     if (size > (unsigned int)(_rx_write - _rx_read))
     {

libraries/Wire/src/Wire.h

@@ -52,7 +52,7 @@ class TwoWire : public Stream
 
     virtual int available(void);
     virtual int read(void);
-    virtual size_t read(uint8_t *buffer, size_t size);
+    virtual int read(uint8_t *buffer, size_t size);
     virtual int peek(void);
     virtual void flush(void);
     void onReceive(void(*)(int));