refactor(quotedprintable): Simplify and modernize code in QuotedPrintable (#1659)

xezon · xezon · commit 6d10c91b97a0 · 2025-10-08T19:29:46.000+02:00
diff --git a/Generals/Code/GameEngine/Source/Common/System/QuotedPrintable.cpp b/Generals/Code/GameEngine/Source/Common/System/QuotedPrintable.cpp
@@ -65,7 +65,8 @@ AsciiString UnicodeStringToQuotedPrintable(UnicodeString original)
 			dest[i++] = MAGIC_CHAR;
 			dest[i++] = intToHexDigit((*src)>>4);
 			dest[i++] = intToHexDigit((*src)&0xf);
-		} else
+		}
+		else
 		{
 			dest[i++] = *src;
 		}
@@ -100,7 +101,8 @@ AsciiString AsciiStringToQuotedPrintable(AsciiString original)
 			dest[i++] = MAGIC_CHAR;
 			dest[i++] = intToHexDigit((*src)>>4);
 			dest[i++] = intToHexDigit((*src)&0xf);
-		} else
+		}
+		else
 		{
 			dest[i++] = *src;
 		}
@@ -117,8 +119,8 @@ UnicodeString QuotedPrintableToUnicodeString(AsciiString original)
 	static WideChar dest[1024];
 	int i=0;
 
-	unsigned char *c = (unsigned char *)dest;
-	const unsigned char *src = (const unsigned char *)original.str();
+	unsigned char *c = reinterpret_cast<unsigned char *>(dest);
+	const unsigned char *src = reinterpret_cast<const unsigned char *>(original.str());
 
 	while (*src && i<1023)
 	{
@@ -159,18 +161,17 @@ UnicodeString QuotedPrintableToUnicodeString(AsciiString original)
 
 	*c = 0;
 
-	UnicodeString out(dest);
-	return out;
+	return dest;
 }
 
 // Convert ascii quoted-printable strings into ascii strings
 AsciiString QuotedPrintableToAsciiString(AsciiString original)
 {
-	static unsigned char dest[1024];
+	static char dest[1024];
 	int i=0;
 
-	unsigned char *c = (unsigned char *)dest;
-	const unsigned char *src = (const unsigned char *)original.str();
+	unsigned char *c = reinterpret_cast<unsigned char *>(dest);
+	const unsigned char *src = reinterpret_cast<const unsigned char *>(original.str());
 
 	while (*src && i<1023)
 	{
@@ -200,6 +201,6 @@ AsciiString QuotedPrintableToAsciiString(AsciiString original)
 
 	*c = 0;
 
-	return AsciiString((const char *)dest);
+	return dest;
 }
 
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/QuotedPrintable.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/QuotedPrintable.cpp
@@ -65,7 +65,8 @@ AsciiString UnicodeStringToQuotedPrintable(UnicodeString original)
 			dest[i++] = MAGIC_CHAR;
 			dest[i++] = intToHexDigit((*src)>>4);
 			dest[i++] = intToHexDigit((*src)&0xf);
-		} else
+		}
+		else
 		{
 			dest[i++] = *src;
 		}
@@ -100,7 +101,8 @@ AsciiString AsciiStringToQuotedPrintable(AsciiString original)
 			dest[i++] = MAGIC_CHAR;
 			dest[i++] = intToHexDigit((*src)>>4);
 			dest[i++] = intToHexDigit((*src)&0xf);
-		} else
+		}
+		else
 		{
 			dest[i++] = *src;
 		}
@@ -117,8 +119,8 @@ UnicodeString QuotedPrintableToUnicodeString(AsciiString original)
 	static WideChar dest[1024];
 	int i=0;
 
-	unsigned char *c = (unsigned char *)dest;
-	const unsigned char *src = (const unsigned char *)original.str();
+	unsigned char *c = reinterpret_cast<unsigned char *>(dest);
+	const unsigned char *src = reinterpret_cast<const unsigned char *>(original.str());
 
 	while (*src && i<1023)
 	{
@@ -159,18 +161,17 @@ UnicodeString QuotedPrintableToUnicodeString(AsciiString original)
 
 	*c = 0;
 
-	UnicodeString out(dest);
-	return out;
+	return dest;
 }
 
 // Convert ascii quoted-printable strings into ascii strings
 AsciiString QuotedPrintableToAsciiString(AsciiString original)
 {
-	static unsigned char dest[1024];
+	static char dest[1024];
 	int i=0;
 
-	unsigned char *c = (unsigned char *)dest;
-	const unsigned char *src = (const unsigned char *)original.str();
+	unsigned char *c = reinterpret_cast<unsigned char *>(dest);
+	const unsigned char *src = reinterpret_cast<const unsigned char *>(original.str());
 
 	while (*src && i<1023)
 	{
@@ -200,6 +201,6 @@ AsciiString QuotedPrintableToAsciiString(AsciiString original)
 
 	*c = 0;
 
-	return AsciiString((const char *)dest);
+	return dest;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,8 @@ AsciiString UnicodeStringToQuotedPrintable(UnicodeString original)`
`65`	`65`	`dest[i++] = MAGIC_CHAR;`
`66`	`66`	`dest[i++] = intToHexDigit((*src)>>4);`
`67`	`67`	`dest[i++] = intToHexDigit((*src)&0xf);`
`68`		`- } else`
	`68`	`+ }`
	`69`	`+ else`
`69`	`70`	`{`
`70`	`71`	`dest[i++] = *src;`
`71`	`72`	`}`
`@@ -100,7 +101,8 @@ AsciiString AsciiStringToQuotedPrintable(AsciiString original)`
`100`	`101`	`dest[i++] = MAGIC_CHAR;`
`101`	`102`	`dest[i++] = intToHexDigit((*src)>>4);`
`102`	`103`	`dest[i++] = intToHexDigit((*src)&0xf);`
`103`		`- } else`
	`104`	`+ }`
	`105`	`+ else`
`104`	`106`	`{`
`105`	`107`	`dest[i++] = *src;`
`106`	`108`	`}`
`@@ -117,8 +119,8 @@ UnicodeString QuotedPrintableToUnicodeString(AsciiString original)`
`117`	`119`	`static WideChar dest[1024];`
`118`	`120`	`int i=0;`
`119`	`121`
`120`		`- unsigned char c = (unsigned char )dest;`
`121`		`- const unsigned char src = (const unsigned char )original.str();`
	`122`	`+ unsigned char c = reinterpret_cast<unsigned char >(dest);`
	`123`	`+ const unsigned char src = reinterpret_cast<const unsigned char >(original.str());`
`122`	`124`
`123`	`125`	`while (*src && i<1023)`
`124`	`126`	`{`
`@@ -159,18 +161,17 @@ UnicodeString QuotedPrintableToUnicodeString(AsciiString original)`
`159`	`161`
`160`	`162`	`*c = 0;`
`161`	`163`
`162`		`- UnicodeString out(dest);`
`163`		`- return out;`
	`164`	`+ return dest;`
`164`	`165`	`}`
`165`	`166`
`166`	`167`	`// Convert ascii quoted-printable strings into ascii strings`
`167`	`168`	`AsciiString QuotedPrintableToAsciiString(AsciiString original)`
`168`	`169`	`{`
`169`		`- static unsigned char dest[1024];`
	`170`	`+ static char dest[1024];`
`170`	`171`	`int i=0;`
`171`	`172`
`172`		`- unsigned char c = (unsigned char )dest;`
`173`		`- const unsigned char src = (const unsigned char )original.str();`
	`173`	`+ unsigned char c = reinterpret_cast<unsigned char >(dest);`
	`174`	`+ const unsigned char src = reinterpret_cast<const unsigned char >(original.str());`
`174`	`175`
`175`	`176`	`while (*src && i<1023)`
`176`	`177`	`{`
`@@ -200,6 +201,6 @@ AsciiString QuotedPrintableToAsciiString(AsciiString original)`
`200`	`201`
`201`	`202`	`*c = 0;`
`202`	`203`
`203`		`- return AsciiString((const char *)dest);`
	`204`	`+ return dest;`
`204`	`205`	`}`
`205`	`206`