diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2012-03-21 23:42:20 -0700 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2012-03-21 23:42:20 -0700 |
| commit | 5cd806a03e4ced3d69ff6e3a8cfc15e015c6a1ab (patch) | |
| tree | 3cdf3a96d8fd7cc2d1fcba8c3117fb72aafab7ad /src | |
| parent | 100da7367767e7fa360f48f07b7a20e9374fda84 (diff) | |
| parent | 4a43dfbf3ec4318b216c79a5a7dd7485a5930cd9 (diff) | |
Merge pull request #969 from laanwj/2012_03_printconsole_error
replace call to PrintConsole with call to error()
Diffstat (limited to 'src')
| -rw-r--r-- | src/bitcoinrpc.cpp | 22 |
1 files changed, 2 insertions, 20 deletions
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" |