From 4909e1f46565607aab8b92d82b2b3d7e9f19efb5 Mon Sep 17 00:00:00 2001 From: Martin Ayotte Date: Fri, 4 Sep 2015 09:54:41 -0400 Subject: [PATCH] change IPAddress::toCharArray() into IPAddress::toString() --- STM32F4/cores/maple/IPAddress.cpp | 6 ++---- STM32F4/cores/maple/IPAddress.h | 3 ++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/STM32F4/cores/maple/IPAddress.cpp b/STM32F4/cores/maple/IPAddress.cpp index a8ed095..b196aad 100644 --- a/STM32F4/cores/maple/IPAddress.cpp +++ b/STM32F4/cores/maple/IPAddress.cpp @@ -73,9 +73,8 @@ size_t IPAddress::printTo(Print& p) const return n; } -char *IPAddress::toCharArray() +String IPAddress::toString() { - static char szRet[20]; String str = String(_address.bytes[0]); str += "."; str += String(_address.bytes[1]); @@ -83,7 +82,6 @@ char *IPAddress::toCharArray() str += String(_address.bytes[2]); str += "."; str += String(_address.bytes[3]); - str.toCharArray(szRet, 20); - return szRet; + return str; } diff --git a/STM32F4/cores/maple/IPAddress.h b/STM32F4/cores/maple/IPAddress.h index eb8a7c0..4ef167e 100644 --- a/STM32F4/cores/maple/IPAddress.h +++ b/STM32F4/cores/maple/IPAddress.h @@ -21,6 +21,7 @@ #define IPAddress_h #include +#include #include // A class to make it easier to handle and pass around IP addresses @@ -60,7 +61,7 @@ public: IPAddress& operator=(uint32_t address); virtual size_t printTo(Print& p) const; - char * toCharArray(); + String toString(); friend class EthernetClass; friend class UDP;