From e62692f5896460556538a14fef1324c4272159ec Mon Sep 17 00:00:00 2001 From: moneromooo-monero Date: Sun, 19 Jul 2015 11:55:36 +0100 Subject: simplewallet: use unsigned long long instead of size_t in message boost doesn't support %zu for size_t, and the previous change to %u could technically lose bits (though it would require splitting a transfer into 4 billion transactions, which seems unlikely). --- src/simplewallet/simplewallet.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index dcb19ac15..d3c1f53e9 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -1421,9 +1421,9 @@ bool simple_wallet::transfer(const std::vector &args_) total_fee += ptx_vector[n].fee; } - std::string prompt_str = (boost::format(tr("Your transaction needs to be split into %u transactions. " + std::string prompt_str = (boost::format(tr("Your transaction needs to be split into %llu transactions. " "This will result in a transaction fee being applied to each transaction, for a total fee of %s. Is this okay? (Y/Yes/N/No)")) % - ptx_vector.size() % print_money(total_fee)).str(); + ((unsigned long long)ptx_vector.size()) % print_money(total_fee)).str(); std::string accepted = command_line::input_line(prompt_str); if (accepted != "Y" && accepted != "y" && accepted != "Yes" && accepted != "yes") { @@ -1552,9 +1552,9 @@ bool simple_wallet::sweep_dust(const std::vector &args_) std::string prompt_str = tr("Sweeping ") + print_money(total_dust); if (ptx_vector.size() > 1) { - prompt_str = (boost::format(tr("Sweeping %s in %u transactions for a total fee of %s. Is this okay? (Y/Yes/N/No)")) % + prompt_str = (boost::format(tr("Sweeping %s in %llu transactions for a total fee of %s. Is this okay? (Y/Yes/N/No)")) % print_money(total_dust) % - ptx_vector.size() % + ((unsigned long long)ptx_vector.size()) % print_money(total_fee)).str(); } else { -- cgit v1.2.3 From 35378f1995fb141926192111694bdc1a44d1da31 Mon Sep 17 00:00:00 2001 From: moneromooo-monero Date: Sun, 19 Jul 2015 12:04:17 +0100 Subject: simplewallet: fix context/string order mismatch --- src/simplewallet/simplewallet.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/simplewallet/simplewallet.h b/src/simplewallet/simplewallet.h index c4411e4d4..8d7b0a811 100644 --- a/src/simplewallet/simplewallet.h +++ b/src/simplewallet/simplewallet.h @@ -169,7 +169,7 @@ namespace cryptonote if (std::chrono::milliseconds(1) < current_time - m_print_time || force) { - std::cout << QT_TRANSLATE_NOOP("Height ", "cryptonote::simple_wallet") << height << " / " << m_blockchain_height << '\r'; + std::cout << QT_TRANSLATE_NOOP("cryptonote::simple_wallet", "Height ") << height << " / " << m_blockchain_height << '\r'; m_print_time = current_time; } } -- cgit v1.2.3