From 20bea5fcc06c12361d79c05d4896ad8aec17504b Mon Sep 17 00:00:00 2001 From: mlafauci Date: Tue, 13 Sep 2011 21:48:09 +0200 Subject: [PATCH] Making Print::write(char *) non-virtual on WiFi lib --- WiFi/WiFiClient.cpp | 11 ----------- WiFi/WiFiClient.h | 1 - WiFi/WiFiServer.cpp | 5 ----- WiFi/WiFiServer.h | 1 - 4 files changed, 18 deletions(-) diff --git a/WiFi/WiFiClient.cpp b/WiFi/WiFiClient.cpp index 9aa0e64cd..e11b086e2 100755 --- a/WiFi/WiFiClient.cpp +++ b/WiFi/WiFiClient.cpp @@ -61,17 +61,6 @@ size_t WiFiClient::write(uint8_t b) { return 0; } -size_t WiFiClient::write(const char *str) { - if (_sock != 255) - { - unsigned int len = strlen(str); - ServerDrv::sendData(_sock, (const uint8_t *)str, len); - while (!ServerDrv::isDataSent(_sock)); - return len; - } - return 0; -} - size_t WiFiClient::write(const uint8_t *buf, size_t size) { if (_sock != 255) { diff --git a/WiFi/WiFiClient.h b/WiFi/WiFiClient.h index 597bcdb56..919532f41 100755 --- a/WiFi/WiFiClient.h +++ b/WiFi/WiFiClient.h @@ -15,7 +15,6 @@ public: virtual int connect(IPAddress ip, uint16_t port); virtual int connect(const char *host, uint16_t port); virtual size_t write(uint8_t); - virtual size_t write(const char *str); virtual size_t write(const uint8_t *buf, size_t size); virtual int available(); virtual int read(); diff --git a/WiFi/WiFiServer.cpp b/WiFi/WiFiServer.cpp index 52277eac8..8461583aa 100755 --- a/WiFi/WiFiServer.cpp +++ b/WiFi/WiFiServer.cpp @@ -51,11 +51,6 @@ void WiFiServer::write(uint8_t b) write(&b, 1); } -void WiFiServer::write(const char *str) -{ - write((const uint8_t *)str, strlen(str)); -} - void WiFiServer::write(const uint8_t *buffer, size_t size) { for (int sock = 0; sock < MAX_SOCK_NUM; sock++) diff --git a/WiFi/WiFiServer.h b/WiFi/WiFiServer.h index 7eb3dd14e..2871d06da 100755 --- a/WiFi/WiFiServer.h +++ b/WiFi/WiFiServer.h @@ -18,7 +18,6 @@ public: WiFiClient available(uint8_t* status = NULL); void begin(); virtual void write(uint8_t); - virtual void write(const char *str); virtual void write(const uint8_t *buf, size_t size); };