diff options
| author | Wladimir J. van der Laan <[email protected]> | 2012-04-03 11:35:33 -0700 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2012-04-03 11:35:33 -0700 |
| commit | fc8c44e3d567a5a3cd1b373bd588015296a5a6f3 (patch) | |
| tree | ade3bfd91c7e92ed83ea79219ed773fbc009ee0e /src/util.cpp | |
| parent | Merge pull request #934 from luke-jr/gitian_luke (diff) | |
| parent | VC2010 compile fixes (diff) | |
| download | discoin-fc8c44e3d567a5a3cd1b373bd588015296a5a6f3.tar.xz discoin-fc8c44e3d567a5a3cd1b373bd588015296a5a6f3.zip | |
Merge pull request #949 from laanwj/2012_03_vc2010compilefixes
VC2010 compile fixes
Diffstat (limited to 'src/util.cpp')
| -rw-r--r-- | src/util.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/util.cpp b/src/util.cpp index 08752e693..cf73ecf5a 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -265,7 +265,7 @@ int my_snprintf(char* buffer, size_t limit, const char* format, ...) return ret; } -string strprintf(const std::string &format, ...) +string real_strprintf(const std::string &format, int dummy, ...) { char buffer[50000]; char* p = buffer; @@ -274,7 +274,7 @@ string strprintf(const std::string &format, ...) loop { va_list arg_ptr; - va_start(arg_ptr, format); + va_start(arg_ptr, dummy); ret = _vsnprintf(p, limit, format.c_str(), arg_ptr); va_end(arg_ptr); if (ret >= 0 && ret < limit) @@ -292,13 +292,13 @@ string strprintf(const std::string &format, ...) return str; } -bool error(const std::string &format, ...) +bool error(const char *format, ...) { char buffer[50000]; int limit = sizeof(buffer); va_list arg_ptr; va_start(arg_ptr, format); - int ret = _vsnprintf(buffer, limit, format.c_str(), arg_ptr); + int ret = _vsnprintf(buffer, limit, format, arg_ptr); va_end(arg_ptr); if (ret < 0 || ret >= limit) { |