util/StringFormat: new utility library

src/db/plugins/upnp/ContentDirectoryService.cxx

@@ -27,6 +27,7 @@
 #include "util/UriUtil.hxx"
 #include "util/RuntimeError.hxx"
 #include "util/ScopeExit.hxx"
+#include "util/StringFormat.hxx"
 
 #include <stdio.h>
 
@@ -47,10 +48,6 @@ ContentDirectoryService::readDirSlice(UpnpClient_Handle hdl,
 				      unsigned &didreadp,
 				      unsigned &totalp) const
 {
-	// Create request
-	char ofbuf[100], cntbuf[100];
-	sprintf(ofbuf, "%u", offset);
-	sprintf(cntbuf, "%u", count);
 	// Some devices require an empty SortCriteria, else bad params
 	IXML_Document *request =
 		MakeActionHelper("Browse", m_serviceType.c_str(),
@@ -58,8 +55,10 @@ ContentDirectoryService::readDirSlice(UpnpClient_Handle hdl,
 				 "BrowseFlag", "BrowseDirectChildren",
 				 "Filter", "*",
 				 "SortCriteria", "",
-				 "StartingIndex", ofbuf,
-				 "RequestedCount", cntbuf);
+				 "StartingIndex",
+				 StringFormat<32>("%u", offset).c_str(),
+				 "RequestedCount",
+				 StringFormat<32>("%u", count).c_str());
 	if (request == nullptr)
 		throw std::runtime_error("UpnpMakeAction() failed");
 
@@ -112,15 +111,13 @@ ContentDirectoryService::search(UpnpClient_Handle hdl,
 	unsigned offset = 0, total = -1, count;
 
 	do {
-		char ofbuf[100];
-		sprintf(ofbuf, "%d", offset);
-
 		UniqueIxmlDocument request(MakeActionHelper("Search", m_serviceType.c_str(),
 							    "ContainerID", objectId,
 							    "SearchCriteria", ss,
 							    "Filter", "*",
 							    "SortCriteria", "",
-							    "StartingIndex", ofbuf,
+							    "StartingIndex",
+							    StringFormat<32>("%u", offset).c_str(),
 							    "RequestedCount", "0")); // Setting a value here gets twonky into fits
 		if (!request)
 			throw std::runtime_error("UpnpMakeAction() failed");