mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-02-18 21:40:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added Vaca::format_string() for std::string.

Browse Source
This commit is contained in:
David Capello 2010-07-03 13:30:06 -03:00
parent 6351aa1db5
commit 2a65c24f74
2 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
third_party/vaca/include/Vaca/String.h vendored
View File

@ -46,7 +46,8 @@ namespace Vaca {
// UTILITARY
// ============================================================
VACA_DLL String format_string(const Char* fmt, ...);
VACA_DLL std::string format_string(const char* fmt, ...);
VACA_DLL std::wstring format_string(const wchar_t* fmt, ...);
VACA_DLL String trim_string(const String& str);
VACA_DLL String trim_string(const Char* str);

41
third_party/vaca/src/String.cpp vendored
View File

@ -44,13 +44,46 @@
using namespace Vaca;
String Vaca::format_string(const Char* fmt, ...)
std::string Vaca::format_string(const char* fmt, ...)
{
std::auto_ptr<Char> buf;
std::auto_ptr<char> buf;
int size = 512;
while (true) {
buf = std::auto_ptr<Char>(new Char[size <<= 1]);
buf = std::auto_ptr<char>(new char[size <<= 1]);
va_list ap;
va_start(ap, fmt);
#if defined(VACA_ON_WINDOWS)
int written = _vsnprintf(buf.get(), size, fmt, ap);
#elif defined(VACA_ON_UNIXLIKE)
int written = vsprintf(buf.get(), size, fmt, ap);
#else
#error Implement this in your platform
#endif
va_end(ap);
if (written == size) {
if (buf.get()[size] == 0)
break;
}
else if (written >= 0 && written < size) {
assert(buf.get()[written] == 0);
break;
}
// else continue growing the buffer...
}
return std::string(buf.get());
}
std::wstring Vaca::format_string(const wchar_t* fmt, ...)
{
std::auto_ptr<wchar_t> buf;
int size = 512;
while (true) {
buf = std::auto_ptr<wchar_t>(new wchar_t[size <<= 1]);
va_list ap;
va_start(ap, fmt);
@ -74,7 +107,7 @@ String Vaca::format_string(const Char* fmt, ...)
// else continue growing the buffer...
}
return String(buf.get());
return std::wstring(buf.get());
}
String Vaca::trim_string(const String& str)