3pp-mirror/barrier
1
0
Fork 0
mirror of https://github.com/debauchee/barrier.git synced 2025-07-19 09:27:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

fixed XArchEvalUnix using wrong memeber, string_format using c++11 (which we're not ready for yet), code style (indentation and new lines)

Browse source
This commit is contained in:
Nick Bolton 2014-03-20 13:34:21 +00:00
parent f9fe1130ac
commit e34e39a41c
3 changed files with 76 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

67
src/lib/base/String.cpp
View file

@ -17,7 +17,7 @@
#include "base/String.h"
#include <memory>
#include <stdio.h>
#include <cstdarg>
void
@ -26,40 +26,37 @@ find_replace_all(
const CString& find,
const CString& replace)
{
size_t pos = 0;
while ((pos = subject.find(find, pos)) != CString::npos) {
subject.replace(pos, find.length(), replace);
pos += replace.length();
}
size_t pos = 0;
while ((pos = subject.find(find, pos)) != CString::npos) {
subject.replace(pos, find.length(), replace);
pos += replace.length();
}
}
CString
string_format(const CString format, ...)
{
// reserve 2 times as much as the length of the format
size_t final, n = format.size() * 2;
CString str;
std::unique_ptr<char[]> formatted;
va_list ap;
while (true) {
// wrap the plain char array in unique_ptr
formatted.reset(new char[n]);
strcpy(&formatted[0], format.c_str());
va_start(ap, format);
final = vsnprintf(&formatted[0], n, format.c_str(), ap);
va_end(ap);
if (final < 0 || final >= n) {
n += abs(static_cast<int>(final - n + 1));
}
else {
break;
}
}
return CString(formatted.get());
CString
string_format(const std::string fmt, ...)
{
int size = 100;
std::string str;
va_list ap;
while (true) {
str.resize(size);
va_start(ap, fmt);
int n = vsnprintf((char *)str.c_str(), size, fmt.c_str(), ap);
va_end(ap);
if (n > -1 && n < size) {
str.resize(n);
return str;
}
if (n > -1) {
size = n + 1;
}
else {
size *= 2;
}
}
return str;
}