diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2012-03-22 08:51:37 -0400 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2012-03-22 08:51:37 -0400 |
| commit | e53f03172a4b6d89c5a65d367c47f6d126692ca6 (patch) | |
| tree | bc60316ace667f22936c9ede468d12ebc35289d2 | |
| parent | 8f188ece3c82c4cf5d52a3363e7643c23169c0ff (diff) | |
| parent | 5cd806a03e4ced3d69ff6e3a8cfc15e015c6a1ab (diff) | |
Merge branch 'master' of github.com:bitcoin/bitcoin
| -rw-r--r-- | bitcoin-qt.pro | 2 | ||||
| -rw-r--r-- | src/bitcoinrpc.cpp | 22 |
2 files changed, 3 insertions, 21 deletions
diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro index 9fb92afd09..18d30c8dcb 100644 --- a/bitcoin-qt.pro +++ b/bitcoin-qt.pro @@ -244,7 +244,7 @@ CODECFORTR = UTF-8 TRANSLATIONS = $$files(src/qt/locale/bitcoin_*.ts) isEmpty(QMAKE_LRELEASE) { - win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\lrelease.exe + win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\\lrelease.exe else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease } isEmpty(TS_DIR):TS_DIR = src/qt/locale diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp index 5571c344a3..874d19f69c 100644 --- a/src/bitcoinrpc.cpp +++ b/src/bitcoinrpc.cpp @@ -54,24 +54,6 @@ Object JSONRPCError(int code, const string& message) return error; } - -void PrintConsole(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.c_str(), arg_ptr); - va_end(arg_ptr); - if (ret < 0 || ret >= limit) - { - ret = limit - 1; - buffer[limit-1] = 0; - } - printf("%s", buffer); - fprintf(stdout, "%s", buffer); -} - double GetDifficulty(const CBlockIndex* blockindex = NULL) { // Floating point number that is a multiple of the minimum difficulty, @@ -2388,8 +2370,8 @@ void ThreadRPCServer2(void* parg) strWhatAmI = strprintf(_("To use the %s option"), "\"-server\""); else if (mapArgs.count("-daemon")) strWhatAmI = strprintf(_("To use the %s option"), "\"-daemon\""); - PrintConsole( - _("Error: %s, you must set a rpcpassword in the configuration file:\n %s\n" + ::error( + _("%s, you must set a rpcpassword in the configuration file:\n %s\n" "It is recommended you use the following random password:\n" "rpcuser=bitcoinrpc\n" "rpcpassword=%s\n" |