Skip to content

Commit 9295973

Browse files
damellisdamellis
committedAug 26, 2011
Changing from long to ssize_t (int) for write(), print(), println() return.
·
old_compiler_removal1.0-beta2
1 parent 3f0b7f2 commit 9295973

File tree

23 files changed

+123
-121
lines changed

23 files changed

+123
-121
lines changed
 

‎hardware/arduino/cores/arduino/HardwareSerial.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ void HardwareSerial::flush()
352352
;
353353
}
354354

355-
long HardwareSerial::write(uint8_t c)
355+
ssize_t HardwareSerial::write(uint8_t c)
356356
{
357357
int i = (_tx_buffer->head + 1) % SERIAL_BUFFER_SIZE;
358358

‎hardware/arduino/cores/arduino/HardwareSerial.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class HardwareSerial : public Stream
5555
virtual int peek(void);
5656
virtual int read(void);
5757
virtual void flush(void);
58-
virtual long write(uint8_t);
58+
virtual ssize_t write(uint8_t);
5959
using Print::write; // pull in write(str) and write(buf, size) from Print
6060
};
6161

‎hardware/arduino/cores/arduino/Print.cpp

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
// Public Methods //////////////////////////////////////////////////////////////
3131

3232
/* default implementation: may be overridden */
33-
long Print::write(const char *str)
33+
ssize_t Print::write(const char *str)
3434
{
35-
long n = 0;
35+
ssize_t n = 0;
3636
while (*str) {
3737
if (write(*str++) <= 0) break;
3838
n++;
@@ -41,20 +41,20 @@ long Print::write(const char *str)
4141
}
4242

4343
/* default implementation: may be overridden */
44-
long Print::write(const uint8_t *buffer, size_t size)
44+
ssize_t Print::write(const uint8_t *buffer, size_t size)
4545
{
46-
long n = 0;
46+
ssize_t n = 0;
4747
while (size--) {
4848
if (write(*buffer++) <= 0) break;
4949
n++;
5050
}
5151
return n;
5252
}
5353

54-
long Print::print(const __FlashStringHelper *ifsh)
54+
ssize_t Print::print(const __FlashStringHelper *ifsh)
5555
{
5656
const prog_char *p = (const prog_char *)ifsh;
57-
long n = 0;
57+
ssize_t n = 0;
5858
while (1) {
5959
unsigned char c = pgm_read_byte(p++);
6060
if (c == 0) break;
@@ -64,48 +64,48 @@ long Print::print(const __FlashStringHelper *ifsh)
6464
return n;
6565
}
6666

67-
long Print::print(const String &s)
67+
ssize_t Print::print(const String &s)
6868
{
69-
long n = 0;
69+
ssize_t n = 0;
7070
for (int i = 0; i < s.length(); i++) {
7171
if (write(s[i]) < 0) break;
7272
n++;
7373
}
7474
return n;
7575
}
7676

77-
long Print::print(const char str[])
77+
ssize_t Print::print(const char str[])
7878
{
7979
return write(str);
8080
}
8181

82-
long Print::print(char c)
82+
ssize_t Print::print(char c)
8383
{
8484
return write(c);
8585
}
8686

87-
long Print::print(unsigned char b, int base)
87+
ssize_t Print::print(unsigned char b, int base)
8888
{
8989
return print((unsigned long) b, base);
9090
}
9191

92-
long Print::print(int n, int base)
92+
ssize_t Print::print(int n, int base)
9393
{
9494
return print((long) n, base);
9595
}
9696

97-
long Print::print(unsigned int n, int base)
97+
ssize_t Print::print(unsigned int n, int base)
9898
{
9999
return print((unsigned long) n, base);
100100
}
101101

102-
long Print::print(long n, int base)
102+
ssize_t Print::print(long n, int base)
103103
{
104104
if (base == 0) {
105105
return write(n);
106106
} else if (base == 10) {
107107
if (n < 0) {
108-
long t = print('-');
108+
int t = print('-');
109109
if (t <= 0) return t;
110110
n = -n;
111111
return printNumber(n, 10) + 1;
@@ -116,110 +116,110 @@ long Print::print(long n, int base)
116116
}
117117
}
118118

119-
long Print::print(unsigned long n, int base)
119+
ssize_t Print::print(unsigned long n, int base)
120120
{
121121
if (base == 0) return write(n);
122122
else return printNumber(n, base);
123123
}
124124

125-
long Print::print(double n, int digits)
125+
ssize_t Print::print(double n, int digits)
126126
{
127127
return printFloat(n, digits);
128128
}
129129

130-
long Print::println(const __FlashStringHelper *ifsh)
130+
ssize_t Print::println(const __FlashStringHelper *ifsh)
131131
{
132-
long n = print(ifsh);
132+
ssize_t n = print(ifsh);
133133
if (n >= 0) n += println();
134134
return n;
135135
}
136136

137-
long Print::print(const Printable& x)
137+
ssize_t Print::print(const Printable& x)
138138
{
139139
return x.printTo(*this);
140140
}
141141

142-
long Print::println(void)
142+
ssize_t Print::println(void)
143143
{
144-
long t = print('\r');
144+
ssize_t t = print('\r');
145145
if (t <= 0) return t;
146146
if (print('\n') <= 0) return 1;
147147
return 2;
148148
}
149149

150-
long Print::println(const String &s)
150+
ssize_t Print::println(const String &s)
151151
{
152-
long n = print(s);
152+
ssize_t n = print(s);
153153
if (n >= 0) n += println();
154154
return n;
155155
}
156156

157-
long Print::println(const char c[])
157+
ssize_t Print::println(const char c[])
158158
{
159-
long n = print(c);
159+
ssize_t n = print(c);
160160
if (n >= 0) n += println();
161161
return n;
162162
}
163163

164-
long Print::println(char c)
164+
ssize_t Print::println(char c)
165165
{
166-
long n = print(c);
166+
ssize_t n = print(c);
167167
if (n > 0) n += println();
168168
return n;
169169
}
170170

171-
long Print::println(unsigned char b, int base)
171+
ssize_t Print::println(unsigned char b, int base)
172172
{
173-
long n = print(b, base);
173+
ssize_t n = print(b, base);
174174
if (n >= 0) n += println();
175175
return n;
176176
}
177177

178-
long Print::println(int num, int base)
178+
ssize_t Print::println(int num, int base)
179179
{
180-
long n = print(num, base);
180+
ssize_t n = print(num, base);
181181
if (n >= 0) n += println();
182182
return n;
183183
}
184184

185-
long Print::println(unsigned int num, int base)
185+
ssize_t Print::println(unsigned int num, int base)
186186
{
187-
long n = print(num, base);
187+
ssize_t n = print(num, base);
188188
if (n >= 0) n += println();
189189
return n;
190190
}
191191

192-
long Print::println(long num, int base)
192+
ssize_t Print::println(long num, int base)
193193
{
194-
long n = print(num, base);
194+
ssize_t n = print(num, base);
195195
if (n >= 0) n += println();
196196
return n;
197197
}
198198

199-
long Print::println(unsigned long num, int base)
199+
ssize_t Print::println(unsigned long num, int base)
200200
{
201-
long n = print(num, base);
201+
ssize_t n = print(num, base);
202202
if (n >= 0) n += println();
203203
return n;
204204
}
205205

206-
long Print::println(double num, int digits)
206+
ssize_t Print::println(double num, int digits)
207207
{
208-
long n = print(num, digits);
208+
ssize_t n = print(num, digits);
209209
if (n >= 0) n += println();
210210
return n;
211211
}
212212

213-
long Print::println(const Printable& x)
213+
ssize_t Print::println(const Printable& x)
214214
{
215-
long n = print(x);
215+
ssize_t n = print(x);
216216
if (n >= 0) n += println();
217217
return n;
218218
}
219219

220220
// Private Methods /////////////////////////////////////////////////////////////
221221

222-
long Print::printNumber(unsigned long n, uint8_t base) {
222+
ssize_t Print::printNumber(unsigned long n, uint8_t base) {
223223
char buf[8 * sizeof(long) + 1]; // Assumes 8-bit chars plus zero byte.
224224
char *str = &buf[sizeof(buf) - 1];
225225

@@ -238,9 +238,9 @@ long Print::printNumber(unsigned long n, uint8_t base) {
238238
return write(str);
239239
}
240240

241-
long Print::printFloat(double number, uint8_t digits)
241+
ssize_t Print::printFloat(double number, uint8_t digits)
242242
{
243-
long n = 0, t;
243+
ssize_t n = 0, t;
244244

245245
// Handle negative numbers
246246
if (number < 0.0)

‎hardware/arduino/cores/arduino/Print.h

Lines changed: 30 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
#include <inttypes.h>
2424
#include <stdio.h> // for size_t
2525

26+
typedef int ssize_t;
27+
2628
#include "WString.h"
2729
#include "Printable.h"
2830

@@ -34,37 +36,37 @@
3436
class Print
3537
{
3638
private:
37-
long printNumber(unsigned long, uint8_t);
38-
long printFloat(double, uint8_t);
39+
ssize_t printNumber(unsigned long, uint8_t);
40+
ssize_t printFloat(double, uint8_t);
3941
public:
40-
virtual long write(uint8_t) = 0;
41-
virtual long write(const char *str);
42-
virtual long write(const uint8_t *buffer, size_t size);
42+
virtual ssize_t write(uint8_t) = 0;
43+
virtual ssize_t write(const char *str);
44+
virtual ssize_t write(const uint8_t *buffer, size_t size);
4345

44-
long print(const __FlashStringHelper *);
45-
long print(const String &);
46-
long print(const char[]);
47-
long print(char);
48-
long print(unsigned char, int = DEC);
49-
long print(int, int = DEC);
50-
long print(unsigned int, int = DEC);
51-
long print(long, int = DEC);
52-
long print(unsigned long, int = DEC);
53-
long print(double, int = 2);
54-
long print(const Printable&);
46+
ssize_t print(const __FlashStringHelper *);
47+
ssize_t print(const String &);
48+
ssize_t print(const char[]);
49+
ssize_t print(char);
50+
ssize_t print(unsigned char, int = DEC);
51+
ssize_t print(int, int = DEC);
52+
ssize_t print(unsigned int, int = DEC);
53+
ssize_t print(long, int = DEC);
54+
ssize_t print(unsigned long, int = DEC);
55+
ssize_t print(double, int = 2);
56+
ssize_t print(const Printable&);
5557

56-
long println(const __FlashStringHelper *);
57-
long println(const String &s);
58-
long println(const char[]);
59-
long println(char);
60-
long println(unsigned char, int = DEC);
61-
long println(int, int = DEC);
62-
long println(unsigned int, int = DEC);
63-
long println(long, int = DEC);
64-
long println(unsigned long, int = DEC);
65-
long println(double, int = 2);
66-
long println(const Printable&);
67-
long println(void);
58+
ssize_t println(const __FlashStringHelper *);
59+
ssize_t println(const String &s);
60+
ssize_t println(const char[]);
61+
ssize_t println(char);
62+
ssize_t println(unsigned char, int = DEC);
63+
ssize_t println(int, int = DEC);
64+
ssize_t println(unsigned int, int = DEC);
65+
ssize_t println(long, int = DEC);
66+
ssize_t println(unsigned long, int = DEC);
67+
ssize_t println(double, int = 2);
68+
ssize_t println(const Printable&);
69+
ssize_t println(void);
6870
};
6971

7072
#endif

‎hardware/arduino/cores/arduino/Printable.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class Print;
3030
class Printable
3131
{
3232
public:
33-
virtual long printTo(Print& p) const = 0;
33+
virtual ssize_t printTo(Print& p) const = 0;
3434
};
3535

3636
#endif

‎libraries/Ethernet/Client.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,15 @@ int Client::connect(IPAddress ip, uint16_t port) {
7070
return 1;
7171
}
7272

73-
long Client::write(uint8_t b) {
73+
ssize_t Client::write(uint8_t b) {
7474
return write(&b, 1);
7575
}
7676

77-
long Client::write(const char *str) {
77+
ssize_t Client::write(const char *str) {
7878
return write((const uint8_t *) str, strlen(str));
7979
}
8080

81-
long Client::write(const uint8_t *buf, size_t size) {
81+
ssize_t Client::write(const uint8_t *buf, size_t size) {
8282
if (_sock == MAX_SOCK_NUM) return -1;
8383
if (!send(_sock, buf, size)) return -2;
8484
return size;

‎libraries/Ethernet/Client.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ class Client : public Stream {
1212
uint8_t status();
1313
int connect(IPAddress ip, uint16_t port);
1414
int connect(const char *host, uint16_t port);
15-
virtual long write(uint8_t);
16-
virtual long write(const char *str);
17-
virtual long write(const uint8_t *buf, size_t size);
15+
virtual ssize_t write(uint8_t);
16+
virtual ssize_t write(const char *str);
17+
virtual ssize_t write(const uint8_t *buf, size_t size);
1818
virtual int available();
1919
virtual int read();
2020
virtual int read(uint8_t *buf, size_t size);

‎libraries/Ethernet/IPAddress.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ bool IPAddress::operator==(const uint8_t* addr)
4242
return memcmp(addr, _address, sizeof(_address)) == 0;
4343
}
4444

45-
long IPAddress::printTo(Print& p) const
45+
ssize_t IPAddress::printTo(Print& p) const
4646
{
47-
long n = 0, t;
47+
ssize_t n = 0, t;
4848
for (int i =0; i < 3; i++)
4949
{
5050
if ((t = p.print(_address[i], DEC)) > 0) n += t;

0 commit comments

Comments
 (0)
Please sign in to comment.