Improved portability of String class (maniacbug)

cmaglie · cmaglie · commit 673847c8b67f · 2014-01-01T17:22:40.000+01:00
diff --git 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
@@ -21,7 +21,6 @@
 
 #include "WString.h"
 
-
 /*********************************************/
 /*  Constructors                             */
 /*********************************************/
@@ -69,39 +68,39 @@ 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;
 }
 
 String::String(int value, unsigned char base)
 {
 	init();
-	char buf[18];
+	char buf[2 + 8 * sizeof(int)];
 	itoa(value, buf, base);
 	*this = buf;
 }
 
 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;
 }
 
 String::String(long value, unsigned char base)
 {
 	init();
-	char buf[34];
+	char buf[2 + 8 * sizeof(long)];
 	ltoa(value, buf, base);
 	*this = buf;
 }
 
 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
@@ -70,39 +70,39 @@ 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;
 }
 
 String::String(int value, unsigned char base)
 {
 	init();
-	char buf[18];
+	char buf[2 + 8 * sizeof(int)];
 	itoa(value, buf, base);
 	*this = buf;
 }
 
 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;
 }
 
 String::String(long value, unsigned char base)
 {
 	init();
-	char buf[34];
+	char buf[2 + 8 * sizeof(long)];
 	ltoa(value, buf, base);
 	*this = buf;
 }
 
 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));
 }

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@`
`21`	`21`
`22`	`22`	`#include "WString.h"`
`23`	`23`
`24`		`-`
`25`	`24`	`/*********************************************/`
`26`	`25`	`/* Constructors */`
`27`	`26`	`/*********************************************/`
`@@ -69,39 +68,39 @@ String::String(char c)`
`69`	`68`	`String::String(unsigned char value, unsigned char base)`
`70`	`69`	`{`
`71`	`70`	`init();`
`72`		`- char buf[9];`
	`71`	`+ char buf[1 + 8 * sizeof(unsigned char)];`
`73`	`72`	`utoa(value, buf, base);`
`74`	`73`	`*this = buf;`
`75`	`74`	`}`
`76`	`75`
`77`	`76`	`String::String(int value, unsigned char base)`
`78`	`77`	`{`
`79`	`78`	`init();`
`80`		`- char buf[18];`
	`79`	`+ char buf[2 + 8 * sizeof(int)];`
`81`	`80`	`itoa(value, buf, base);`
`82`	`81`	`*this = buf;`
`83`	`82`	`}`
`84`	`83`
`85`	`84`	`String::String(unsigned int value, unsigned char base)`
`86`	`85`	`{`
`87`	`86`	`init();`
`88`		`- char buf[17];`
	`87`	`+ char buf[1 + 8 * sizeof(unsigned int)];`
`89`	`88`	`utoa(value, buf, base);`
`90`	`89`	`*this = buf;`
`91`	`90`	`}`
`92`	`91`
`93`	`92`	`String::String(long value, unsigned char base)`
`94`	`93`	`{`
`95`	`94`	`init();`
`96`		`- char buf[34];`
	`95`	`+ char buf[2 + 8 * sizeof(long)];`
`97`	`96`	`ltoa(value, buf, base);`
`98`	`97`	`*this = buf;`
`99`	`98`	`}`
`100`	`99`
`101`	`100`	`String::String(unsigned long value, unsigned char base)`
`102`	`101`	`{`
`103`	`102`	`init();`
`104`		`- char buf[33];`
	`103`	`+ char buf[1 + 8 * sizeof(unsigned long)];`
`105`	`104`	`ultoa(value, buf, base);`
`106`	`105`	`*this = buf;`
`107`	`106`	`}`
`@@ -288,35 +287,35 @@ unsigned char String::concat(char c)`
`288`	`287`
`289`	`288`	`unsigned char String::concat(unsigned char num)`
`290`	`289`	`{`
`291`		`- char buf[4];`
	`290`	`+ char buf[1 + 3 * sizeof(unsigned char)];`
`292`	`291`	`itoa(num, buf, 10);`
`293`	`292`	`return concat(buf, strlen(buf));`
`294`	`293`	`}`
`295`	`294`
`296`	`295`	`unsigned char String::concat(int num)`
`297`	`296`	`{`
`298`		`- char buf[12];`
	`297`	`+ char buf[2 + 3 * sizeof(int)];`
`299`	`298`	`itoa(num, buf, 10);`
`300`	`299`	`return concat(buf, strlen(buf));`
`301`	`300`	`}`
`302`	`301`
`303`	`302`	`unsigned char String::concat(unsigned int num)`
`304`	`303`	`{`
`305`		`- char buf[11];`
	`304`	`+ char buf[1 + 3 * sizeof(unsigned int)];`
`306`	`305`	`utoa(num, buf, 10);`
`307`	`306`	`return concat(buf, strlen(buf));`
`308`	`307`	`}`
`309`	`308`
`310`	`309`	`unsigned char String::concat(long num)`
`311`	`310`	`{`
`312`		`- char buf[12];`
	`311`	`+ char buf[2 + 3 * sizeof(long)];`
`313`	`312`	`ltoa(num, buf, 10);`
`314`	`313`	`return concat(buf, strlen(buf));`
`315`	`314`	`}`
`316`	`315`
`317`	`316`	`unsigned char String::concat(unsigned long num)`
`318`	`317`	`{`
`319`		`- char buf[11];`
	`318`	`+ char buf[1 + 3 * sizeof(unsigned long)];`
`320`	`319`	`ultoa(num, buf, 10);`
`321`	`320`	`return concat(buf, strlen(buf));`
`322`	`321`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,39 +70,39 @@ String::String(char c)`
`70`	`70`	`String::String(unsigned char value, unsigned char base)`
`71`	`71`	`{`
`72`	`72`	`init();`
`73`		`- char buf[9];`
	`73`	`+ char buf[1 + 8 * sizeof(unsigned char)];`
`74`	`74`	`utoa(value, buf, base);`
`75`	`75`	`*this = buf;`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`String::String(int value, unsigned char base)`
`79`	`79`	`{`
`80`	`80`	`init();`
`81`		`- char buf[18];`
	`81`	`+ char buf[2 + 8 * sizeof(int)];`
`82`	`82`	`itoa(value, buf, base);`
`83`	`83`	`*this = buf;`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`String::String(unsigned int value, unsigned char base)`
`87`	`87`	`{`
`88`	`88`	`init();`
`89`		`- char buf[17];`
	`89`	`+ char buf[1 + 8 * sizeof(unsigned int)];`
`90`	`90`	`utoa(value, buf, base);`
`91`	`91`	`*this = buf;`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`String::String(long value, unsigned char base)`
`95`	`95`	`{`
`96`	`96`	`init();`
`97`		`- char buf[34];`
	`97`	`+ char buf[2 + 8 * sizeof(long)];`
`98`	`98`	`ltoa(value, buf, base);`
`99`	`99`	`*this = buf;`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`String::String(unsigned long value, unsigned char base)`
`103`	`103`	`{`
`104`	`104`	`init();`
`105`		`- char buf[33];`
	`105`	`+ char buf[1 + 8 * sizeof(unsigned long)];`
`106`	`106`	`ultoa(value, buf, base);`
`107`	`107`	`*this = buf;`
`108`	`108`	`}`
`@@ -289,35 +289,35 @@ unsigned char String::concat(char c)`
`289`	`289`
`290`	`290`	`unsigned char String::concat(unsigned char num)`
`291`	`291`	`{`
`292`		`- char buf[4];`
	`292`	`+ char buf[1 + 3 * sizeof(unsigned char)];`
`293`	`293`	`itoa(num, buf, 10);`
`294`	`294`	`return concat(buf, strlen(buf));`
`295`	`295`	`}`
`296`	`296`
`297`	`297`	`unsigned char String::concat(int num)`
`298`	`298`	`{`
`299`		`- char buf[12];`
	`299`	`+ char buf[2 + 3 * sizeof(int)];`
`300`	`300`	`itoa(num, buf, 10);`
`301`	`301`	`return concat(buf, strlen(buf));`
`302`	`302`	`}`
`303`	`303`
`304`	`304`	`unsigned char String::concat(unsigned int num)`
`305`	`305`	`{`
`306`		`- char buf[11];`
	`306`	`+ char buf[1 + 3 * sizeof(unsigned int)];`
`307`	`307`	`utoa(num, buf, 10);`
`308`	`308`	`return concat(buf, strlen(buf));`
`309`	`309`	`}`
`310`	`310`
`311`	`311`	`unsigned char String::concat(long num)`
`312`	`312`	`{`
`313`		`- char buf[12];`
	`313`	`+ char buf[2 + 3 * sizeof(long)];`
`314`	`314`	`ltoa(num, buf, 10);`
`315`	`315`	`return concat(buf, strlen(buf));`
`316`	`316`	`}`
`317`	`317`
`318`	`318`	`unsigned char String::concat(unsigned long num)`
`319`	`319`	`{`
`320`		`- char buf[11];`
	`320`	`+ char buf[1 + 3 * sizeof(unsigned long)];`
`321`	`321`	`ultoa(num, buf, 10);`
`322`	`322`	`return concat(buf, strlen(buf));`
`323`	`323`	`}`