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

5 files changed, 78 insertions, 76 deletions

diff --git a/cores/arduino/HardwareSerial.cpp b/cores/arduino/HardwareSerial.cpp
index a200da5..641c973 100644
--- a/cores/arduino/HardwareSerial.cpp
+++ b/cores/arduino/HardwareSerial.cpp
@@ -352,7 +352,7 @@ void HardwareSerial::flush()
     ;
 }
 
-long HardwareSerial::write(uint8_t c)
+ssize_t HardwareSerial::write(uint8_t c)
 {
   int i = (_tx_buffer->head + 1) % SERIAL_BUFFER_SIZE;
 	
diff --git a/cores/arduino/HardwareSerial.h b/cores/arduino/HardwareSerial.h
index 4af8c59..960d3f5 100644
--- a/cores/arduino/HardwareSerial.h
+++ b/cores/arduino/HardwareSerial.h
@@ -55,7 +55,7 @@ class HardwareSerial : public Stream
     virtual int peek(void);
     virtual int read(void);
     virtual void flush(void);
-    virtual long write(uint8_t);
+    virtual ssize_t write(uint8_t);
     using Print::write; // pull in write(str) and write(buf, size) from Print
 };
 
diff --git a/cores/arduino/Print.cpp b/cores/arduino/Print.cpp
index 58b1032..192d9a3 100755
--- a/cores/arduino/Print.cpp
+++ b/cores/arduino/Print.cpp
@@ -30,9 +30,9 @@
 // Public Methods //////////////////////////////////////////////////////////////
 
 /* default implementation: may be overridden */
-long Print::write(const char *str)
+ssize_t Print::write(const char *str)
 {
-  long n = 0;
+  ssize_t n = 0;
   while (*str) {
     if (write(*str++) <= 0) break;
     n++;
@@ -41,9 +41,9 @@ long Print::write(const char *str)
 }
 
 /* default implementation: may be overridden */
-long Print::write(const uint8_t *buffer, size_t size)
+ssize_t Print::write(const uint8_t *buffer, size_t size)
 {
-  long n = 0;
+  ssize_t n = 0;
   while (size--) {
     if (write(*buffer++) <= 0) break;
     n++;
@@ -51,10 +51,10 @@ long Print::write(const uint8_t *buffer, size_t size)
   return n;
 }
 
-long Print::print(const __FlashStringHelper *ifsh)
+ssize_t Print::print(const __FlashStringHelper *ifsh)
 {
   const prog_char *p = (const prog_char *)ifsh;
-  long n = 0;
+  ssize_t n = 0;
   while (1) {
     unsigned char c = pgm_read_byte(p++);
     if (c == 0) break;
@@ -64,9 +64,9 @@ long Print::print(const __FlashStringHelper *ifsh)
   return n;
 }
 
-long Print::print(const String &s)
+ssize_t Print::print(const String &s)
 {
-  long n = 0;
+  ssize_t n = 0;
   for (int i = 0; i < s.length(); i++) {
     if (write(s[i]) < 0) break;
     n++;
@@ -74,38 +74,38 @@ long Print::print(const String &s)
   return n;
 }
 
-long Print::print(const char str[])
+ssize_t Print::print(const char str[])
 {
   return write(str);
 }
 
-long Print::print(char c)
+ssize_t Print::print(char c)
 {
   return write(c);
 }
 
-long Print::print(unsigned char b, int base)
+ssize_t Print::print(unsigned char b, int base)
 {
   return print((unsigned long) b, base);
 }
 
-long Print::print(int n, int base)
+ssize_t Print::print(int n, int base)
 {
   return print((long) n, base);
 }
 
-long Print::print(unsigned int n, int base)
+ssize_t Print::print(unsigned int n, int base)
 {
   return print((unsigned long) n, base);
 }
 
-long Print::print(long n, int base)
+ssize_t Print::print(long n, int base)
 {
   if (base == 0) {
     return write(n);
   } else if (base == 10) {
     if (n < 0) {
-      long t = print('-');
+      int t = print('-');
       if (t <= 0) return t;
       n = -n;
       return printNumber(n, 10) + 1;
@@ -116,110 +116,110 @@ long Print::print(long n, int base)
   }
 }
 
-long Print::print(unsigned long n, int base)
+ssize_t Print::print(unsigned long n, int base)
 {
   if (base == 0) return write(n);
   else return printNumber(n, base);
 }
 
-long Print::print(double n, int digits)
+ssize_t Print::print(double n, int digits)
 {
   return printFloat(n, digits);
 }
 
-long Print::println(const __FlashStringHelper *ifsh)
+ssize_t Print::println(const __FlashStringHelper *ifsh)
 {
-  long n = print(ifsh);
+  ssize_t n = print(ifsh);
   if (n >= 0) n += println();
   return n;
 }
 
-long Print::print(const Printable& x)
+ssize_t Print::print(const Printable& x)
 {
   return x.printTo(*this);
 }
 
-long Print::println(void)
+ssize_t Print::println(void)
 {
-  long t = print('\r');
+  ssize_t t = print('\r');
   if (t <= 0) return t;
   if (print('\n') <= 0) return 1;
   return 2;
 }
 
-long Print::println(const String &s)
+ssize_t Print::println(const String &s)
 {
-  long n = print(s);
+  ssize_t n = print(s);
   if (n >= 0) n += println();
   return n;
 }
 
-long Print::println(const char c[])
+ssize_t Print::println(const char c[])
 {
-  long n = print(c);
+  ssize_t n = print(c);
   if (n >= 0) n += println();
   return n;
 }
 
-long Print::println(char c)
+ssize_t Print::println(char c)
 {
-  long n = print(c);
+  ssize_t n = print(c);
   if (n > 0) n += println();
   return n;
 }
 
-long Print::println(unsigned char b, int base)
+ssize_t Print::println(unsigned char b, int base)
 {
-  long n = print(b, base);
+  ssize_t n = print(b, base);
   if (n >= 0) n += println();
   return n;
 }
 
-long Print::println(int num, int base)
+ssize_t Print::println(int num, int base)
 {
-  long n = print(num, base);
+  ssize_t n = print(num, base);
   if (n >= 0) n += println();
   return n;
 }
 
-long Print::println(unsigned int num, int base)
+ssize_t Print::println(unsigned int num, int base)
 {
-  long n = print(num, base);
+  ssize_t n = print(num, base);
   if (n >= 0) n += println();
   return n;
 }
 
-long Print::println(long num, int base)
+ssize_t Print::println(long num, int base)
 {
-  long n = print(num, base);
+  ssize_t n = print(num, base);
   if (n >= 0) n += println();
   return n;
 }
 
-long Print::println(unsigned long num, int base)
+ssize_t Print::println(unsigned long num, int base)
 {
-  long n = print(num, base);
+  ssize_t n = print(num, base);
   if (n >= 0) n += println();
   return n;
 }
 
-long Print::println(double num, int digits)
+ssize_t Print::println(double num, int digits)
 {
-  long n = print(num, digits);
+  ssize_t n = print(num, digits);
   if (n >= 0) n += println();
   return n;
 }
 
-long Print::println(const Printable& x)
+ssize_t Print::println(const Printable& x)
 {
-  long n = print(x);
+  ssize_t n = print(x);
   if (n >= 0) n += println();
   return n;
 }
 
 // Private Methods /////////////////////////////////////////////////////////////
 
-long Print::printNumber(unsigned long n, uint8_t base) {
+ssize_t Print::printNumber(unsigned long n, uint8_t base) {
   char buf[8 * sizeof(long) + 1]; // Assumes 8-bit chars plus zero byte.
   char *str = &buf[sizeof(buf) - 1];
 
@@ -238,9 +238,9 @@ long Print::printNumber(unsigned long n, uint8_t base) {
   return write(str);
 }
 
-long Print::printFloat(double number, uint8_t digits) 
+ssize_t Print::printFloat(double number, uint8_t digits) 
 { 
-  long n = 0, t;
+  ssize_t n = 0, t;
   
   // Handle negative numbers
   if (number < 0.0)
diff --git a/cores/arduino/Print.h b/cores/arduino/Print.h
index d5b02ff..3f303f3 100755
--- a/cores/arduino/Print.h
+++ b/cores/arduino/Print.h
@@ -23,6 +23,8 @@
 #include <inttypes.h>
 #include <stdio.h> // for size_t
 
+typedef int ssize_t;
+
 #include "WString.h"
 #include "Printable.h"
 
@@ -34,37 +36,37 @@
 class Print
 {
   private:
-    long printNumber(unsigned long, uint8_t);
-    long printFloat(double, uint8_t);
+    ssize_t printNumber(unsigned long, uint8_t);
+    ssize_t printFloat(double, uint8_t);
   public:
-    virtual long write(uint8_t) = 0;
-    virtual long write(const char *str);
-    virtual long write(const uint8_t *buffer, size_t size);
+    virtual ssize_t write(uint8_t) = 0;
+    virtual ssize_t write(const char *str);
+    virtual ssize_t write(const uint8_t *buffer, size_t size);
     
-    long print(const __FlashStringHelper *);
-    long print(const String &);
-    long print(const char[]);
-    long print(char);
-    long print(unsigned char, int = DEC);
-    long print(int, int = DEC);
-    long print(unsigned int, int = DEC);
-    long print(long, int = DEC);
-    long print(unsigned long, int = DEC);
-    long print(double, int = 2);
-    long print(const Printable&);
+    ssize_t print(const __FlashStringHelper *);
+    ssize_t print(const String &);
+    ssize_t print(const char[]);
+    ssize_t print(char);
+    ssize_t print(unsigned char, int = DEC);
+    ssize_t print(int, int = DEC);
+    ssize_t print(unsigned int, int = DEC);
+    ssize_t print(long, int = DEC);
+    ssize_t print(unsigned long, int = DEC);
+    ssize_t print(double, int = 2);
+    ssize_t print(const Printable&);
 
-    long println(const __FlashStringHelper *);
-    long println(const String &s);
-    long println(const char[]);
-    long println(char);
-    long println(unsigned char, int = DEC);
-    long println(int, int = DEC);
-    long println(unsigned int, int = DEC);
-    long println(long, int = DEC);
-    long println(unsigned long, int = DEC);
-    long println(double, int = 2);
-    long println(const Printable&);
-    long println(void);
+    ssize_t println(const __FlashStringHelper *);
+    ssize_t println(const String &s);
+    ssize_t println(const char[]);
+    ssize_t println(char);
+    ssize_t println(unsigned char, int = DEC);
+    ssize_t println(int, int = DEC);
+    ssize_t println(unsigned int, int = DEC);
+    ssize_t println(long, int = DEC);
+    ssize_t println(unsigned long, int = DEC);
+    ssize_t println(double, int = 2);
+    ssize_t println(const Printable&);
+    ssize_t println(void);
 };
 
 #endif
diff --git a/cores/arduino/Printable.h b/cores/arduino/Printable.h
index 6814ee4..9065904 100644
--- a/cores/arduino/Printable.h
+++ b/cores/arduino/Printable.h
@@ -30,7 +30,7 @@ class Print;
 class Printable
 {
   public:
-    virtual long printTo(Print& p) const = 0;
+    virtual ssize_t printTo(Print& p) const = 0;
 };
 
 #endif