diff options
| author | Wladimir J. van der Laan <[email protected]> | 2011-06-18 18:42:13 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2011-07-07 15:18:35 +0200 |
| commit | 42c405ad2340c11c769643ab8aee5e6ab118d2a1 (patch) | |
| tree | 6fa28271ee08848e20815586c7551f7fe9223ba6 /src/util.cpp | |
| parent | CKeyStore::AddKey must return a boolean (diff) | |
| download | discoin-42c405ad2340c11c769643ab8aee5e6ab118d2a1.tar.xz discoin-42c405ad2340c11c769643ab8aee5e6ab118d2a1.zip | |
temp patch for qtui
Diffstat (limited to 'src/util.cpp')
| -rw-r--r-- | src/util.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/util.cpp b/src/util.cpp index 479c601ee..3d89f6a82 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -263,8 +263,7 @@ int my_snprintf(char* buffer, size_t limit, const char* format, ...) return ret; } - -string strprintf(const char* format, ...) +string strprintf(const std::string &format, ...) { char buffer[50000]; char* p = buffer; @@ -274,7 +273,7 @@ string strprintf(const char* format, ...) { va_list arg_ptr; va_start(arg_ptr, format); - ret = _vsnprintf(p, limit, format, arg_ptr); + ret = _vsnprintf(p, limit, format.c_str(), arg_ptr); va_end(arg_ptr); if (ret >= 0 && ret < limit) break; @@ -291,14 +290,13 @@ string strprintf(const char* format, ...) return str; } - -bool error(const char* format, ...) +bool error(const std::string &format, ...) { char buffer[50000]; int limit = sizeof(buffer); va_list arg_ptr; va_start(arg_ptr, format); - int ret = _vsnprintf(buffer, limit, format, arg_ptr); + int ret = _vsnprintf(buffer, limit, format.c_str(), arg_ptr); va_end(arg_ptr); if (ret < 0 || ret >= limit) { |