From: Wladimir J. van der Laan Date: Wed, 21 Mar 2012 19:33:53 +0000 (+0100) Subject: replace call to PrintConsole with call to error() X-Git-Tag: v0.4.0-unstable~129^2~141^2^2 X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=4a43dfbf3ec4318b216c79a5a7dd7485a5930cd9;hp=b2fe3a5ca690299a55f52beee3932f0126b79363 replace call to PrintConsole with call to error() As these are equivalent functions, this cleans up the source a bit. Also remove PrintConsole() as this was the only use. --- diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp index 5571c34..874d19f 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"