From 673847c8b67f705682de724d1010bde267206c00 Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Tue, 31 Dec 2013 22:30:55 +0100 Subject: [PATCH] Improved portability of String class (maniacbug) --- build/shared/revisions.txt | 1 + .../arduino/avr/cores/arduino/WString.cpp | 21 +++++++++---------- .../arduino/sam/cores/arduino/WString.cpp | 20 +++++++++--------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/build/shared/revisions.txt b/build/shared/revisions.txt index 0e7c272f5..6af2d0c3b 100644 --- a/build/shared/revisions.txt +++ b/build/shared/revisions.txt @@ -13,6 +13,7 @@ ARDUINO 1.5.6 BETA * sam: Fixed regression in analogRead() (fails to read multiple channels) (Mark Tillotson) * sam: Optimized delayMicroseconds() (Rob Tillaart) #1121 * Optimized Print::print(String&) method, now uses internal string buffer to perform block write +* Improved portability of String class (maniacbug) #695 ARDUINO 1.5.5 BETA 2013.11.28 diff --git a/hardware/arduino/avr/cores/arduino/WString.cpp b/hardware/arduino/avr/cores/arduino/WString.cpp index 8b6eabe88..ed880ce2b 100644 --- a/hardware/arduino/avr/cores/arduino/WString.cpp +++ b/hardware/arduino/avr/cores/arduino/WString.cpp @@ -21,7 +21,6 @@ #include "WString.h" - /*********************************************/ /* Constructors */ /*********************************************/ @@ -69,7 +68,7 @@ String::String(char c) String::String(unsigned char value, unsigned char base) { init(); - char buf[9]; + char buf[1 + 8 * sizeof(unsigned char)]; utoa(value, buf, base); *this = buf; } @@ -77,7 +76,7 @@ String::String(unsigned char value, unsigned char base) String::String(int value, unsigned char base) { init(); - char buf[18]; + char buf[2 + 8 * sizeof(int)]; itoa(value, buf, base); *this = buf; } @@ -85,7 +84,7 @@ String::String(int value, unsigned char base) String::String(unsigned int value, unsigned char base) { init(); - char buf[17]; + char buf[1 + 8 * sizeof(unsigned int)]; utoa(value, buf, base); *this = buf; } @@ -93,7 +92,7 @@ String::String(unsigned int value, unsigned char base) String::String(long value, unsigned char base) { init(); - char buf[34]; + char buf[2 + 8 * sizeof(long)]; ltoa(value, buf, base); *this = buf; } @@ -101,7 +100,7 @@ String::String(long value, unsigned char base) String::String(unsigned long value, unsigned char base) { init(); - char buf[33]; + char buf[1 + 8 * sizeof(unsigned long)]; ultoa(value, buf, base); *this = buf; } @@ -288,35 +287,35 @@ unsigned char String::concat(char c) unsigned char String::concat(unsigned char num) { - char buf[4]; + char buf[1 + 3 * sizeof(unsigned char)]; itoa(num, buf, 10); return concat(buf, strlen(buf)); } unsigned char String::concat(int num) { - char buf[12]; + char buf[2 + 3 * sizeof(int)]; itoa(num, buf, 10); return concat(buf, strlen(buf)); } unsigned char String::concat(unsigned int num) { - char buf[11]; + char buf[1 + 3 * sizeof(unsigned int)]; utoa(num, buf, 10); return concat(buf, strlen(buf)); } unsigned char String::concat(long num) { - char buf[12]; + char buf[2 + 3 * sizeof(long)]; ltoa(num, buf, 10); return concat(buf, strlen(buf)); } unsigned char String::concat(unsigned long num) { - char buf[11]; + char buf[1 + 3 * sizeof(unsigned long)]; ultoa(num, buf, 10); return concat(buf, strlen(buf)); } diff --git a/hardware/arduino/sam/cores/arduino/WString.cpp b/hardware/arduino/sam/cores/arduino/WString.cpp index 0fc0a5da8..939ca0e2a 100644 --- a/hardware/arduino/sam/cores/arduino/WString.cpp +++ b/hardware/arduino/sam/cores/arduino/WString.cpp @@ -70,7 +70,7 @@ String::String(char c) String::String(unsigned char value, unsigned char base) { init(); - char buf[9]; + char buf[1 + 8 * sizeof(unsigned char)]; utoa(value, buf, base); *this = buf; } @@ -78,7 +78,7 @@ String::String(unsigned char value, unsigned char base) String::String(int value, unsigned char base) { init(); - char buf[18]; + char buf[2 + 8 * sizeof(int)]; itoa(value, buf, base); *this = buf; } @@ -86,7 +86,7 @@ String::String(int value, unsigned char base) String::String(unsigned int value, unsigned char base) { init(); - char buf[17]; + char buf[1 + 8 * sizeof(unsigned int)]; utoa(value, buf, base); *this = buf; } @@ -94,7 +94,7 @@ String::String(unsigned int value, unsigned char base) String::String(long value, unsigned char base) { init(); - char buf[34]; + char buf[2 + 8 * sizeof(long)]; ltoa(value, buf, base); *this = buf; } @@ -102,7 +102,7 @@ String::String(long value, unsigned char base) String::String(unsigned long value, unsigned char base) { init(); - char buf[33]; + char buf[1 + 8 * sizeof(unsigned long)]; ultoa(value, buf, base); *this = buf; } @@ -289,35 +289,35 @@ unsigned char String::concat(char c) unsigned char String::concat(unsigned char num) { - char buf[4]; + char buf[1 + 3 * sizeof(unsigned char)]; itoa(num, buf, 10); return concat(buf, strlen(buf)); } unsigned char String::concat(int num) { - char buf[12]; + char buf[2 + 3 * sizeof(int)]; itoa(num, buf, 10); return concat(buf, strlen(buf)); } unsigned char String::concat(unsigned int num) { - char buf[11]; + char buf[1 + 3 * sizeof(unsigned int)]; utoa(num, buf, 10); return concat(buf, strlen(buf)); } unsigned char String::concat(long num) { - char buf[12]; + char buf[2 + 3 * sizeof(long)]; ltoa(num, buf, 10); return concat(buf, strlen(buf)); } unsigned char String::concat(unsigned long num) { - char buf[11]; + char buf[1 + 3 * sizeof(unsigned long)]; ultoa(num, buf, 10); return concat(buf, strlen(buf)); }