1
0
mirror of https://github.com/esp8266/Arduino.git synced 2025-07-30 16:24:09 +03:00

Changing from long to ssize_t (int) for write(), print(), println() return.

This commit is contained in:
David A. Mellis
2011-08-26 14:20:41 -04:00
parent 3f0b7f21c2
commit 929597375b
23 changed files with 123 additions and 121 deletions

View File

@ -70,15 +70,15 @@ int Client::connect(IPAddress ip, uint16_t port) {
return 1;
}
long Client::write(uint8_t b) {
ssize_t Client::write(uint8_t b) {
return write(&b, 1);
}
long Client::write(const char *str) {
ssize_t Client::write(const char *str) {
return write((const uint8_t *) str, strlen(str));
}
long Client::write(const uint8_t *buf, size_t size) {
ssize_t Client::write(const uint8_t *buf, size_t size) {
if (_sock == MAX_SOCK_NUM) return -1;
if (!send(_sock, buf, size)) return -2;
return size;

View File

@ -12,9 +12,9 @@ public:
uint8_t status();
int connect(IPAddress ip, uint16_t port);
int connect(const char *host, uint16_t port);
virtual long write(uint8_t);
virtual long write(const char *str);
virtual long write(const uint8_t *buf, size_t size);
virtual ssize_t write(uint8_t);
virtual ssize_t write(const char *str);
virtual ssize_t write(const uint8_t *buf, size_t size);
virtual int available();
virtual int read();
virtual int read(uint8_t *buf, size_t size);

View File

@ -42,9 +42,9 @@ bool IPAddress::operator==(const uint8_t* addr)
return memcmp(addr, _address, sizeof(_address)) == 0;
}
long IPAddress::printTo(Print& p) const
ssize_t IPAddress::printTo(Print& p) const
{
long n = 0, t;
ssize_t n = 0, t;
for (int i =0; i < 3; i++)
{
if ((t = p.print(_address[i], DEC)) > 0) n += t;

View File

@ -60,7 +60,7 @@ public:
IPAddress& operator=(const uint8_t *address);
IPAddress& operator=(uint32_t address);
virtual long printTo(Print& p) const;
virtual ssize_t printTo(Print& p) const;
friend class EthernetClass;
friend class UDP;

View File

@ -67,19 +67,19 @@ Client Server::available()
return Client(MAX_SOCK_NUM);
}
long Server::write(uint8_t b)
ssize_t Server::write(uint8_t b)
{
write(&b, 1);
}
long Server::write(const char *str)
ssize_t Server::write(const char *str)
{
write((const uint8_t *)str, strlen(str));
}
long Server::write(const uint8_t *buffer, size_t size)
ssize_t Server::write(const uint8_t *buffer, size_t size)
{
long n = 0;
ssize_t n = 0;
accept();

View File

@ -14,9 +14,9 @@ public:
Server(uint16_t);
Client available();
void begin();
virtual long write(uint8_t);
virtual long write(const char *str);
virtual long write(const uint8_t *buf, size_t size);
virtual ssize_t write(uint8_t);
virtual ssize_t write(const char *str);
virtual ssize_t write(const uint8_t *buf, size_t size);
};
#endif

View File

@ -102,18 +102,18 @@ int UDP::endPacket()
return sendUDP(_sock);
}
long UDP::write(uint8_t byte)
ssize_t UDP::write(uint8_t byte)
{
return write(&byte, 1);
}
long UDP::write(const char *str)
ssize_t UDP::write(const char *str)
{
size_t len = strlen(str);
return write((const uint8_t *)str, len);
}
long UDP::write(const uint8_t *buffer, size_t size)
ssize_t UDP::write(const uint8_t *buffer, size_t size)
{
uint16_t bytes_written = bufferData(_sock, _offset, buffer, size);
_offset += bytes_written;

View File

@ -67,11 +67,11 @@ public:
// Returns 1 if the packet was sent successfully, 0 if there was an error
int endPacket();
// Write a single byte into the packet
virtual long write(uint8_t);
virtual ssize_t write(uint8_t);
// Write a string of characters into the packet
virtual long write(const char *str);
virtual ssize_t write(const char *str);
// Write size bytes from buffer into the packet
virtual long write(const uint8_t *buffer, size_t size);
virtual ssize_t write(const uint8_t *buffer, size_t size);
// Start processing the next available incoming packet
// Returns the size of the packet in bytes, or 0 if no packets are available

View File

@ -258,7 +258,7 @@ inline void LiquidCrystal::command(uint8_t value) {
send(value, LOW);
}
inline long LiquidCrystal::write(uint8_t value) {
inline ssize_t LiquidCrystal::write(uint8_t value) {
send(value, HIGH);
return 1; // assume sucess
}

View File

@ -79,7 +79,7 @@ public:
void createChar(uint8_t, uint8_t[]);
void setCursor(uint8_t, uint8_t);
virtual long write(uint8_t);
virtual ssize_t write(uint8_t);
void command(uint8_t);
private:
void send(uint8_t, uint8_t);

View File

@ -58,16 +58,16 @@ boolean File::isDirectory(void) {
}
long File::write(uint8_t val) {
ssize_t File::write(uint8_t val) {
return write(&val, 1);
}
long File::write(const char *str) {
ssize_t File::write(const char *str) {
return write((const uint8_t *) str, strlen(str));
}
long File::write(const uint8_t *buf, size_t size) {
long t;
ssize_t File::write(const uint8_t *buf, size_t size) {
ssize_t t;
if (!_file) return -1;
t = _file->write(buf, size);
if (t < 0) return t - 1;

View File

@ -32,9 +32,9 @@ public:
File(SdFile f, char *name); // wraps an underlying SdFile
File(void); // 'empty' constructor
~File(void); // destructor
virtual long write(uint8_t);
virtual long write(const char *str);
virtual long write(const uint8_t *buf, size_t size);
virtual ssize_t write(uint8_t);
virtual ssize_t write(const char *str);
virtual ssize_t write(const uint8_t *buf, size_t size);
virtual int read();
virtual int peek();
virtual int available();

View File

@ -283,9 +283,9 @@ class SdFile : public Print {
}
/** \return SdVolume that contains this file. */
SdVolume* volume(void) const {return vol_;}
long write(uint8_t b);
long write(const void* buf, uint16_t nbyte);
long write(const char* str);
ssize_t write(uint8_t b);
ssize_t write(const void* buf, uint16_t nbyte);
ssize_t write(const char* str);
void write_P(PGM_P str);
void writeln_P(PGM_P str);
//------------------------------------------------------------------------------

View File

@ -1121,7 +1121,7 @@ uint8_t SdFile::truncate(uint32_t length) {
* for a read-only file, device is full, a corrupt file system or an I/O error.
*
*/
long SdFile::write(const void* buf, uint16_t nbyte) {
ssize_t SdFile::write(const void* buf, uint16_t nbyte) {
// convert void* to uint8_t* - must be before goto statements
const uint8_t* src = reinterpret_cast<const uint8_t*>(buf);
@ -1219,7 +1219,7 @@ long SdFile::write(const void* buf, uint16_t nbyte) {
*
* Use SdFile::writeError to check for errors.
*/
long SdFile::write(uint8_t b) {
ssize_t SdFile::write(uint8_t b) {
return write(&b, 1);
}
//------------------------------------------------------------------------------
@ -1228,7 +1228,7 @@ long SdFile::write(uint8_t b) {
*
* Use SdFile::writeError to check for errors.
*/
long SdFile::write(const char* str) {
ssize_t SdFile::write(const char* str) {
return write(str, strlen(str));
}
//------------------------------------------------------------------------------

View File

@ -440,7 +440,7 @@ int SoftwareSerial::available()
return (_receive_buffer_tail + _SS_MAX_RX_BUFF - _receive_buffer_head) % _SS_MAX_RX_BUFF;
}
long SoftwareSerial::write(uint8_t b)
ssize_t SoftwareSerial::write(uint8_t b)
{
if (_tx_delay == 0)
return -1;

View File

@ -89,7 +89,7 @@ public:
bool overflow() { bool ret = _buffer_overflow; _buffer_overflow = false; return ret; }
int peek();
virtual long write(uint8_t byte);
virtual ssize_t write(uint8_t byte);
virtual int read();
virtual int available();
virtual void flush();

View File

@ -124,7 +124,7 @@ uint8_t TwoWire::endTransmission(void)
// must be called in:
// slave tx event callback
// or after beginTransmission(address)
long TwoWire::write(uint8_t data)
ssize_t TwoWire::write(uint8_t data)
{
if(transmitting){
// in master transmitter mode
@ -148,7 +148,7 @@ long TwoWire::write(uint8_t data)
// must be called in:
// slave tx event callback
// or after beginTransmission(address)
long TwoWire::write(const uint8_t *data, size_t quantity)
ssize_t TwoWire::write(const uint8_t *data, size_t quantity)
{
if(transmitting){
// in master transmitter mode
@ -166,7 +166,7 @@ long TwoWire::write(const uint8_t *data, size_t quantity)
// must be called in:
// slave tx event callback
// or after beginTransmission(address)
long TwoWire::write(const char *data)
ssize_t TwoWire::write(const char *data)
{
return write((uint8_t*)data, strlen(data));
}

View File

@ -52,9 +52,9 @@ class TwoWire : public Stream
uint8_t endTransmission(void);
uint8_t requestFrom(uint8_t, uint8_t);
uint8_t requestFrom(int, int);
virtual long write(uint8_t);
virtual long write(const char *);
virtual long write(const uint8_t *, size_t);
virtual ssize_t write(uint8_t);
virtual ssize_t write(const char *);
virtual ssize_t write(const uint8_t *, size_t);
virtual int available(void);
virtual int read(void);
virtual int peek(void);