Skip to content

Commit b78df36

Browse files
committed
Making Print::write(char *) non-virtual.
http://code.google.com/p/arduino/issues/detail?id=607
1 parent fef1169 commit b78df36

File tree

6 files changed

+5
-19
lines changed

6 files changed

+5
-19
lines changed

EthernetClient.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,6 @@ size_t EthernetClient::write(uint8_t b) {
7474
return write(&b, 1);
7575
}
7676

77-
size_t EthernetClient::write(const char *str) {
78-
return write((const uint8_t *) str, strlen(str));
79-
}
80-
8177
size_t EthernetClient::write(const uint8_t *buf, size_t size) {
8278
if (_sock == MAX_SOCK_NUM) {
8379
setWriteError();

EthernetClient.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ class EthernetClient : public Client {
1515
virtual int connect(IPAddress ip, uint16_t port);
1616
virtual int connect(const char *host, uint16_t port);
1717
virtual size_t write(uint8_t);
18-
virtual size_t write(const char *str);
1918
virtual size_t write(const uint8_t *buf, size_t size);
2019
virtual int available();
2120
virtual int read();
@@ -27,6 +26,8 @@ class EthernetClient : public Client {
2726
virtual operator bool();
2827

2928
friend class EthernetServer;
29+
30+
using Print::write;
3031

3132
private:
3233
static uint16_t _srcport;

EthernetServer.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,6 @@ size_t EthernetServer::write(uint8_t b)
7272
write(&b, 1);
7373
}
7474

75-
size_t EthernetServer::write(const char *str)
76-
{
77-
write((const uint8_t *)str, strlen(str));
78-
}
79-
8075
size_t EthernetServer::write(const uint8_t *buffer, size_t size)
8176
{
8277
size_t n = 0;

EthernetServer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ public Server {
1515
EthernetClient available();
1616
virtual void begin();
1717
virtual size_t write(uint8_t);
18-
virtual size_t write(const char *str);
1918
virtual size_t write(const uint8_t *buf, size_t size);
19+
using Print::write;
2020
};
2121

2222
#endif

EthernetUdp.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,12 +107,6 @@ size_t EthernetUDP::write(uint8_t byte)
107107
return write(&byte, 1);
108108
}
109109

110-
size_t EthernetUDP::write(const char *str)
111-
{
112-
size_t len = strlen(str);
113-
return write((const uint8_t *)str, len);
114-
}
115-
116110
size_t EthernetUDP::write(const uint8_t *buffer, size_t size)
117111
{
118112
uint16_t bytes_written = bufferData(_sock, _offset, buffer, size);

EthernetUdp.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,10 @@ class EthernetUDP : public UDP {
6767
virtual int endPacket();
6868
// Write a single byte into the packet
6969
virtual size_t write(uint8_t);
70-
// Write a string of characters into the packet
71-
virtual size_t write(const char *str);
7270
// Write size bytes from buffer into the packet
7371
virtual size_t write(const uint8_t *buffer, size_t size);
72+
73+
using Print::write;
7474

7575
// Start processing the next available incoming packet
7676
// Returns the size of the packet in bytes, or 0 if no packets are available

0 commit comments

Comments
 (0)