foster/bitcoin-bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-08 10:31:50 -05:00
Code Issues Activity

refactor: Enforce C-str fmt strings in WalletLogPrintf()

Browse source
This commit is contained in:
MarcoFalke 2023-08-08 09:30:51 +02:00
parent fa244f3321
commit fa6dc57760
No known key found for this signature in database
5 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
contrib/devtools/bitcoin-tidy/example_logprintf.cpp
View file

@ -37,9 +37,9 @@ class CWallet
public: public:
template <typename... Params> template <typename... Params>
void WalletLogPrintf(std::string fmt, Params... parameters) const void WalletLogPrintf(const char* fmt, Params... parameters) const
{ {
LogPrintf(("%s " + fmt).c_str(), GetDisplayName(), parameters...); LogPrintf(("%s " + std::string{fmt}).c_str(), GetDisplayName(), parameters...);
}; };
}; };

7
src/wallet/scriptpubkeyman.h
View file

@ -249,9 +249,10 @@ public:
virtual std::unordered_set<CScript, SaltedSipHasher> GetScriptPubKeys() const { return {}; }; virtual std::unordered_set<CScript, SaltedSipHasher> GetScriptPubKeys() const { return {}; };
/** Prepends the wallet name in logging output to ease debugging in multi-wallet use cases */ /** Prepends the wallet name in logging output to ease debugging in multi-wallet use cases */
template<typename... Params> template <typename... Params>
void WalletLogPrintf(std::string fmt, Params... parameters) const { void WalletLogPrintf(const char* fmt, Params... parameters) const
LogPrintf(("%s " + fmt).c_str(), m_storage.GetDisplayName(), parameters...); {
LogPrintf(("%s " + std::string{fmt}).c_str(), m_storage.GetDisplayName(), parameters...);
}; };
/** Watch-only address added */ /** Watch-only address added */

2
src/wallet/wallet.cpp
View file

@ -2319,7 +2319,7 @@ OutputType CWallet::TransactionChangeType(const std::optional<OutputType>& chang
void CWallet::CommitTransaction(CTransactionRef tx, mapValue_t mapValue, std::vector<std::pair<std::string, std::string>> orderForm) void CWallet::CommitTransaction(CTransactionRef tx, mapValue_t mapValue, std::vector<std::pair<std::string, std::string>> orderForm)
{ {
LOCK(cs_wallet); LOCK(cs_wallet);
WalletLogPrintf("CommitTransaction:\n%s", tx->ToString()); WalletLogPrintf("CommitTransaction:\n%s", tx->ToString()); // NOLINT(bitcoin-unterminated-logprintf)
// Add tx to wallet, because if it has change it's also ours, // Add tx to wallet, because if it has change it's also ours,
// otherwise just for transaction history. // otherwise just for transaction history.

7
src/wallet/wallet.h
View file

@ -890,9 +890,10 @@ public:
}; };
/** Prepends the wallet name in logging output to ease debugging in multi-wallet use cases */ /** Prepends the wallet name in logging output to ease debugging in multi-wallet use cases */
template<typename... Params> template <typename... Params>
void WalletLogPrintf(std::string fmt, Params... parameters) const { void WalletLogPrintf(const char* fmt, Params... parameters) const
LogPrintf(("%s " + fmt).c_str(), GetDisplayName(), parameters...); {
LogPrintf(("%s " + std::string{fmt}).c_str(), GetDisplayName(), parameters...);
}; };
/** Upgrade the wallet */ /** Upgrade the wallet */

8
test/lint/run-lint-format-strings.py
View file

@ -20,10 +20,10 @@ FALSE_POSITIVES = [
("src/clientversion.cpp", "strprintf(_(COPYRIGHT_HOLDERS).translated, COPYRIGHT_HOLDERS_SUBSTITUTION)"), ("src/clientversion.cpp", "strprintf(_(COPYRIGHT_HOLDERS).translated, COPYRIGHT_HOLDERS_SUBSTITUTION)"),
("src/test/translation_tests.cpp", "strprintf(format, arg)"), ("src/test/translation_tests.cpp", "strprintf(format, arg)"),
("src/validationinterface.cpp", "LogPrint(BCLog::VALIDATION, fmt \"\\n\", __VA_ARGS__)"), ("src/validationinterface.cpp", "LogPrint(BCLog::VALIDATION, fmt \"\\n\", __VA_ARGS__)"),
("src/wallet/wallet.h", "WalletLogPrintf(std::string fmt, Params... parameters)"), ("src/wallet/wallet.h", "WalletLogPrintf(const char* fmt, Params... parameters)"),
("src/wallet/wallet.h", "LogPrintf((\"%s \" + fmt).c_str(), GetDisplayName(), parameters...)"), ("src/wallet/wallet.h", "LogPrintf((\"%s \" + std::string{fmt}).c_str(), GetDisplayName(), parameters...)"),
("src/wallet/scriptpubkeyman.h", "WalletLogPrintf(std::string fmt, Params... parameters)"), ("src/wallet/scriptpubkeyman.h", "WalletLogPrintf(const char* fmt, Params... parameters)"),
("src/wallet/scriptpubkeyman.h", "LogPrintf((\"%s \" + fmt).c_str(), m_storage.GetDisplayName(), parameters...)"), ("src/wallet/scriptpubkeyman.h", "LogPrintf((\"%s \" + std::string{fmt}).c_str(), m_storage.GetDisplayName(), parameters...)"),
] ]