Use string instead

Author: mrotteveel

src/common/cvt.cpp

@@ -2369,17 +2369,18 @@ static void datetime_to_text(const dsc* from, dsc* to, Callbacks* cb)
 
 	if (!from->isTime())
 	{
-		// yyyy-mm-dd OR dd-MMM-yyyy + nul-termination
-		char dateStr[11 + 1];
+		string dateStr;
+		// yyyy-mm-dd OR dd-MMM-yyyy
+		dateStr.reserve(11);
 		if (from->dsc_dtype == dtype_sql_date || !version4)
 		{
-			snprintf(dateStr, sizeof(dateStr), "%4.4d-%2.2d-%2.2d",
+			dateStr.printf("%4.4d-%2.2d-%2.2d",
 					times.tm_year + 1900, times.tm_mon + 1, times.tm_mday);
 		}
 		else
 		{
 			// Prior to BLR version 5 timestamps were converted to text in the dd-MMM-yyyy format
-			snprintf(dateStr, sizeof(dateStr), "%2.2d-%.3s-%4.4d",
+			dateStr.printf("%2.2d-%.3s-%4.4d",
 					times.tm_mday,
 					FB_LONG_MONTHS_UPPER[times.tm_mon], times.tm_year + 1900);
 		}
@@ -2395,17 +2396,18 @@ static void datetime_to_text(const dsc* from, dsc* to, Callbacks* cb)
 
 	if (from->dsc_dtype != dtype_sql_date)
 	{
-		// hh:mm:ss.tttt + nul-termination
-		char timeStr[13 + 1];
+		string timeStr;
+		// hh:mm:ss.tttt
+		timeStr.reserve(13);
 		if (from->isTime() || !version4)
 		{
-			snprintf(timeStr, sizeof(timeStr), "%2.2d:%2.2d:%2.2d.%4.4d",
+			timeStr.printf("%2.2d:%2.2d:%2.2d.%4.4d",
 					times.tm_hour, times.tm_min, times.tm_sec, fractions);
 		}
 		else if (times.tm_hour || times.tm_min || times.tm_sec || fractions)
 		{
 			// Timestamp formating prior to BLR Version 5 is slightly different
-			snprintf(timeStr, sizeof(timeStr), " %d:%.2d:%.2d.%.4d",
+			timeStr.printf(" %d:%.2d:%.2d.%.4d",
 					times.tm_hour, times.tm_min, times.tm_sec, fractions);
 		}
 		temp.append(timeStr);

src/common/os/guid.h

@@ -121,34 +121,27 @@ class Guid
 		memcpy(&m_data, buffer, SIZE);
 	}
 
-	[[deprecated("use toString(char* buffer, size_t sz)")]]
-	void toString(char* buffer) const
+	template<typename T>
+	void toString(T& str) const
 	{
-		sprintf(buffer, GUID_FORMAT,
+		str.printf(GUID_FORMAT,
 			m_data.Data1, m_data.Data2, m_data.Data3,
 			m_data.Data4[0], m_data.Data4[1], m_data.Data4[2], m_data.Data4[3],
 			m_data.Data4[4], m_data.Data4[5], m_data.Data4[6], m_data.Data4[7]);
 	}
 
-	void toString(char* buffer, size_t sz) const
-	{
-		snprintf(buffer, sz, GUID_FORMAT,
-			m_data.Data1, m_data.Data2, m_data.Data3,
-			m_data.Data4[0], m_data.Data4[1], m_data.Data4[2], m_data.Data4[3],
-			m_data.Data4[4], m_data.Data4[5], m_data.Data4[6], m_data.Data4[7]);
-	}
 
 	Firebird::string toString() const
 	{
 		Firebird::string result;
-		toString(result.getBuffer(GUID_BUFF_SIZE - 1), GUID_BUFF_SIZE);
+		toString(result);
 		return result;
 	}
 
 	Firebird::PathName toPathName() const
 	{
 		Firebird::PathName result;
-		toString(result.getBuffer(GUID_BUFF_SIZE - 1), GUID_BUFF_SIZE);
+		toString(result);
 		return result;
 	}