Merge bitcoin#17279: refactor: Remove redundant c_str() calls in formatting

MarcoFalke · MarcoFalke · commit 4c1090c882ea · 2019-10-28T15:10:06.000-04:00
c72906d refactor: Remove redundant c_str() calls in formatting (Wladimir J. van der Laan) Pull request description: Our formatter, tinyformat, *never* needs `c_str()` for strings. Still, many places call it redundantly, resulting in longer code and a slight overhead. Remove redundant `c_str()` calls for: - `strprintf` - `LogPrintf` - `tfm::format` (also, combined with bitcoin#17095, I think this improves logging in case of unexpected embedded NULL characters) ACKs for top commit: ryanofsky: Code review ACK c72906d. Easy to review with `git log -p -n1 --word-diff-regex=. -U0 c72906d` Tree-SHA512: 9e21e7bed8aaff59b8b8aa11571396ddc265fb29608c2545b1fcdbbb36d65b37eb361db6688dd36035eab0c110f8de255375cfda50df3d9d7708bc092f67fefc
diff --git a/src/bench/bench_bitcoin.cpp b/src/bench/bench_bitcoin.cpp
@@ -36,7 +36,7 @@ int main(int argc, char** argv)
     SetupBenchArgs();
     std::string error;
     if (!gArgs.ParseParameters(argc, argv, error)) {
-        tfm::format(std::cerr, "Error parsing command line arguments: %s\n", error.c_str());
+        tfm::format(std::cerr, "Error parsing command line arguments: %s\n", error);
         return EXIT_FAILURE;
     }
 
@@ -60,7 +60,7 @@ int main(int argc, char** argv)
 
     double scaling_factor;
     if (!ParseDouble(scaling_str, &scaling_factor)) {
-        tfm::format(std::cerr, "Error parsing scaling factor as double: %s\n", scaling_str.c_str());
+        tfm::format(std::cerr, "Error parsing scaling factor as double: %s\n", scaling_str);
         return EXIT_FAILURE;
     }
 
diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp
@@ -105,7 +105,7 @@ static int AppInitRPC(int argc, char* argv[])
     SetupCliArgs();
     std::string error;
     if (!gArgs.ParseParameters(argc, argv, error)) {
-        tfm::format(std::cerr, "Error parsing command line arguments: %s\n", error.c_str());
+        tfm::format(std::cerr, "Error parsing command line arguments: %s\n", error);
         return EXIT_FAILURE;
     }
     if (argc < 2 || HelpRequested(gArgs) || gArgs.IsArgSet("-version")) {
@@ -119,19 +119,19 @@ static int AppInitRPC(int argc, char* argv[])
             strUsage += "\n" + gArgs.GetHelpMessage();
         }
 
-        tfm::format(std::cout, "%s", strUsage.c_str());
+        tfm::format(std::cout, "%s", strUsage);
         if (argc < 2) {
             tfm::format(std::cerr, "Error: too few parameters\n");
             return EXIT_FAILURE;
         }
         return EXIT_SUCCESS;
     }
     if (!CheckDataDirOption()) {
-        tfm::format(std::cerr, "Error: Specified data directory \"%s\" does not exist.\n", gArgs.GetArg("-datadir", "").c_str());
+        tfm::format(std::cerr, "Error: Specified data directory \"%s\" does not exist.\n", gArgs.GetArg("-datadir", ""));
         return EXIT_FAILURE;
     }
     if (!gArgs.ReadConfigFiles(error, true)) {
-        tfm::format(std::cerr, "Error reading configuration file: %s\n", error.c_str());
+        tfm::format(std::cerr, "Error reading configuration file: %s\n", error);
         return EXIT_FAILURE;
     }
     // Check for -chain, -testnet or -regtest parameter (BaseParams() calls are only valid after this clause)
@@ -393,7 +393,7 @@ static UniValue CallRPC(BaseRequestHandler *rh, const std::string& strMethod, co
         if (failedToGetAuthCookie) {
             throw std::runtime_error(strprintf(
                 "Could not locate RPC credentials. No authentication cookie could be found, and RPC password is not set.  See -rpcpassword and -stdinrpcpass.  Configuration file: (%s)",
-                GetConfigFile(gArgs.GetArg("-conf", BITCOIN_CONF_FILENAME)).string().c_str()));
+                GetConfigFile(gArgs.GetArg("-conf", BITCOIN_CONF_FILENAME)).string()));
         } else {
             throw std::runtime_error("Authorization failed: Incorrect rpcuser or rpcpassword");
         }
@@ -541,7 +541,7 @@ static int CommandLineRPC(int argc, char *argv[])
     }
 
     if (strPrint != "") {
-        tfm::format(nRet == 0 ? std::cout : std::cerr, "%s\n", strPrint.c_str());
+        tfm::format(nRet == 0 ? std::cout : std::cerr, "%s\n", strPrint);
     }
     return nRet;
 }
diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp
@@ -83,7 +83,7 @@ static int AppInitRawTx(int argc, char* argv[])
     SetupBitcoinTxArgs();
     std::string error;
     if (!gArgs.ParseParameters(argc, argv, error)) {
-        tfm::format(std::cerr, "Error parsing command line arguments: %s\n", error.c_str());
+        tfm::format(std::cerr, "Error parsing command line arguments: %s\n", error);
         return EXIT_FAILURE;
     }
 
@@ -105,7 +105,7 @@ static int AppInitRawTx(int argc, char* argv[])
             "\n";
         strUsage += gArgs.GetHelpMessage();
 
-        tfm::format(std::cout, "%s", strUsage.c_str());
+        tfm::format(std::cout, "%s", strUsage);
 
         if (argc < 2) {
             tfm::format(std::cerr, "Error: too few parameters\n");
@@ -724,21 +724,21 @@ static void OutputTxJSON(const CTransaction& tx)
     TxToUniv(tx, uint256(), entry);
 
     std::string jsonOutput = entry.write(4);
-    tfm::format(std::cout, "%s\n", jsonOutput.c_str());
+    tfm::format(std::cout, "%s\n", jsonOutput);
 }
 
 static void OutputTxHash(const CTransaction& tx)
 {
     std::string strHexHash = tx.GetHash().GetHex(); // the hex-encoded transaction hash (aka the transaction id)
 
-    tfm::format(std::cout, "%s\n", strHexHash.c_str());
+    tfm::format(std::cout, "%s\n", strHexHash);
 }
 
 static void OutputTxHex(const CTransaction& tx)
 {
     std::string strHex = EncodeHexTx(tx);
 
-    tfm::format(std::cout, "%s\n", strHex.c_str());
+    tfm::format(std::cout, "%s\n", strHex);
 }
 
 static void OutputTx(const CTransaction& tx)
@@ -829,7 +829,7 @@ static int CommandLineRawTx(int argc, char* argv[])
     }
 
     if (strPrint != "") {
-        tfm::format(nRet == 0 ? std::cout : std::cerr, "%s\n", strPrint.c_str());
+        tfm::format(nRet == 0 ? std::cout : std::cerr, "%s\n", strPrint);
     }
     return nRet;
 }
diff --git a/src/bitcoin-wallet.cpp b/src/bitcoin-wallet.cpp
@@ -36,7 +36,7 @@ static bool WalletAppInit(int argc, char* argv[])
     SetupWalletToolArgs();
     std::string error_message;
     if (!gArgs.ParseParameters(argc, argv, error_message)) {
-        tfm::format(std::cerr, "Error parsing command line arguments: %s\n", error_message.c_str());
+        tfm::format(std::cerr, "Error parsing command line arguments: %s\n", error_message);
         return false;
     }
     if (argc < 2 || HelpRequested(gArgs)) {
@@ -48,15 +48,15 @@ static bool WalletAppInit(int argc, char* argv[])
                                      "  bitcoin-wallet [options] <command>\n\n" +
                                      gArgs.GetHelpMessage();
 
-        tfm::format(std::cout, "%s", usage.c_str());
+        tfm::format(std::cout, "%s", usage);
         return false;
     }
 
     // check for printtoconsole, allow -debug
     LogInstance().m_print_to_console = gArgs.GetBoolArg("-printtoconsole", gArgs.GetBoolArg("-debug", false));
 
     if (!CheckDataDirOption()) {
-        tfm::format(std::cerr, "Error: Specified data directory \"%s\" does not exist.\n", gArgs.GetArg("-datadir", "").c_str());
+        tfm::format(std::cerr, "Error: Specified data directory \"%s\" does not exist.\n", gArgs.GetArg("-datadir", ""));
         return false;
     }
     // Check for -testnet or -regtest parameter (Params() calls are only valid after this clause)
@@ -87,7 +87,7 @@ int main(int argc, char* argv[])
     for(int i = 1; i < argc; ++i) {
         if (!IsSwitchChar(argv[i][0])) {
             if (!method.empty()) {
-                tfm::format(std::cerr, "Error: two methods provided (%s and %s). Only one method should be provided.\n", method.c_str(), argv[i]);
+                tfm::format(std::cerr, "Error: two methods provided (%s and %s). Only one method should be provided.\n", method, argv[i]);
                 return EXIT_FAILURE;
             }
             method = argv[i];
diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp
@@ -70,7 +70,7 @@ static bool AppInit(int argc, char* argv[])
             strUsage += "\n" + gArgs.GetHelpMessage();
         }
 
-        tfm::format(std::cout, "%s", strUsage.c_str());
+        tfm::format(std::cout, "%s", strUsage);
         return true;
     }
 
diff --git a/src/init.cpp b/src/init.cpp
@@ -943,7 +943,7 @@ bool AppInitParameterInteraction()
     }
 
     if (!fs::is_directory(GetBlocksDir())) {
-        return InitError(strprintf(_("Specified blocks directory \"%s\" does not exist.").translated, gArgs.GetArg("-blocksdir", "").c_str()));
+        return InitError(strprintf(_("Specified blocks directory \"%s\" does not exist.").translated, gArgs.GetArg("-blocksdir", "")));
     }
 
     // parse and validate enabled filter types
diff --git a/src/net.cpp b/src/net.cpp
@@ -1474,7 +1474,7 @@ static void ThreadMapPort()
                 if (externalIPAddress[0]) {
                     CNetAddr resolved;
                     if (LookupHost(externalIPAddress, resolved, false)) {
-                        LogPrintf("UPnP: ExternalIPAddress = %s\n", resolved.ToString().c_str());
+                        LogPrintf("UPnP: ExternalIPAddress = %s\n", resolved.ToString());
                         AddLocal(resolved, LOCAL_UPNP);
                     }
                 } else {
@@ -2710,7 +2710,7 @@ void CConnman::PushMessage(CNode* pnode, CSerializedNetMsg&& msg)
 {
     size_t nMessageSize = msg.data.size();
     size_t nTotalSize = nMessageSize + CMessageHeader::HEADER_SIZE;
-    LogPrint(BCLog::NET, "sending %s (%d bytes) peer=%d\n",  SanitizeString(msg.command.c_str()), nMessageSize, pnode->GetId());
+    LogPrint(BCLog::NET, "sending %s (%d bytes) peer=%d\n",  SanitizeString(msg.command), nMessageSize, pnode->GetId());
 
     std::vector<unsigned char> serializedHeader;
     serializedHeader.reserve(CMessageHeader::HEADER_SIZE);
diff --git a/src/noui.cpp b/src/noui.cpp
@@ -45,7 +45,7 @@ bool noui_ThreadSafeMessageBox(const std::string& message, const std::string& ca
     if (!fSecure) {
         LogPrintf("%s%s\n", strCaption, message);
     }
-    tfm::format(std::cerr, "%s%s\n", strCaption.c_str(), message.c_str());
+    tfm::format(std::cerr, "%s%s\n", strCaption, message);
     return false;
 }
 
@@ -96,4 +96,4 @@ void noui_reconnect()
     noui_ThreadSafeQuestionConn.disconnect();
     noui_InitMessageConn.disconnect();
     noui_connect();
-}
+}
diff --git a/src/policy/fees.cpp b/src/policy/fees.cpp
@@ -517,7 +517,7 @@ void CBlockPolicyEstimator::processTransaction(const CTxMemPoolEntry& entry, boo
     uint256 hash = entry.GetTx().GetHash();
     if (mapMemPoolTxs.count(hash)) {
         LogPrint(BCLog::ESTIMATEFEE, "Blockpolicy error mempool tx %s already being tracked\n",
-                 hash.ToString().c_str());
+                 hash.ToString());
         return;
     }
 
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
@@ -1602,7 +1602,7 @@ UniValue joinpsbts(const JSONRPCRequest& request)
     for (auto& psbt : psbtxs) {
         for (unsigned int i = 0; i < psbt.tx->vin.size(); ++i) {
             if (!merged_psbt.AddInput(psbt.tx->vin[i], psbt.inputs[i])) {
-                throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Input %s:%d exists in multiple PSBTs", psbt.tx->vin[i].prevout.hash.ToString().c_str(), psbt.tx->vin[i].prevout.n));
+                throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Input %s:%d exists in multiple PSBTs", psbt.tx->vin[i].prevout.hash.ToString(), psbt.tx->vin[i].prevout.n));
             }
         }
         for (unsigned int i = 0; i < psbt.tx->vout.size(); ++i) {
diff --git a/src/script/descriptor.cpp b/src/script/descriptor.cpp
@@ -645,7 +645,7 @@ NODISCARD bool ParseKeyPath(const std::vector<Span<const char>>& split, KeyPath&
         }
         uint32_t p;
         if (!ParseUInt32(std::string(elem.begin(), elem.end()), &p)) {
-            error = strprintf("Key path value '%s' is not a valid uint32", std::string(elem.begin(), elem.end()).c_str());
+            error = strprintf("Key path value '%s' is not a valid uint32", std::string(elem.begin(), elem.end()));
             return false;
         } else if (p > 0x7FFFFFFFUL) {
             error = strprintf("Key path value %u is out of range", p);
@@ -783,7 +783,7 @@ std::unique_ptr<DescriptorImpl> ParseScript(Span<const char>& sp, ParseScriptCon
         uint32_t thres;
         std::vector<std::unique_ptr<PubkeyProvider>> providers;
         if (!ParseUInt32(std::string(threshold.begin(), threshold.end()), &thres)) {
-            error = strprintf("Multi threshold '%s' is not valid", std::string(threshold.begin(), threshold.end()).c_str());
+            error = strprintf("Multi threshold '%s' is not valid", std::string(threshold.begin(), threshold.end()));
             return nullptr;
         }
         size_t script_size = 0;
diff --git a/src/sync.cpp b/src/sync.cpp
@@ -173,15 +173,15 @@ void AssertLockHeldInternal(const char* pszName, const char* pszFile, int nLine,
     for (const std::pair<void*, CLockLocation>& i : g_lockstack)
         if (i.first == cs)
             return;
-    tfm::format(std::cerr, "Assertion failed: lock %s not held in %s:%i; locks held:\n%s", pszName, pszFile, nLine, LocksHeld().c_str());
+    tfm::format(std::cerr, "Assertion failed: lock %s not held in %s:%i; locks held:\n%s", pszName, pszFile, nLine, LocksHeld());
     abort();
 }
 
 void AssertLockNotHeldInternal(const char* pszName, const char* pszFile, int nLine, void* cs)
 {
     for (const std::pair<void*, CLockLocation>& i : g_lockstack) {
         if (i.first == cs) {
-            tfm::format(std::cerr, "Assertion failed: lock %s held in %s:%i; locks held:\n%s", pszName, pszFile, nLine, LocksHeld().c_str());
+            tfm::format(std::cerr, "Assertion failed: lock %s held in %s:%i; locks held:\n%s", pszName, pszFile, nLine, LocksHeld());
             abort();
         }
     }
diff --git a/src/util/system.cpp b/src/util/system.cpp
@@ -305,7 +305,7 @@ NODISCARD static bool InterpretOption(std::string key, std::string val, unsigned
             LogPrintf("Warning: parsed potentially confusing double-negative %s=%s\n", key, val);
             val = "1";
         } else {
-            error = strprintf("Negating of %s is meaningless and therefore forbidden", key.c_str());
+            error = strprintf("Negating of %s is meaningless and therefore forbidden", key);
             return false;
         }
     }
@@ -414,7 +414,7 @@ bool ArgsManager::ParseParameters(int argc, const char* const argv[], std::strin
                 return false;
             }
         } else {
-            error = strprintf("Invalid parameter %s", key.c_str());
+            error = strprintf("Invalid parameter %s", key);
             return false;
         }
     }
@@ -688,7 +688,7 @@ void PrintExceptionContinue(const std::exception* pex, const char* pszThread)
 {
     std::string message = FormatException(pex, pszThread);
     LogPrintf("\n\n************************\n%s\n", message);
-    tfm::format(std::cerr, "\n\n************************\n%s\n", message.c_str());
+    tfm::format(std::cerr, "\n\n************************\n%s\n", message);
 }
 
 fs::path GetDefaultDataDir()
@@ -870,7 +870,7 @@ bool ArgsManager::ReadConfigStream(std::istream& stream, const std::string& file
             if (ignore_invalid_keys) {
                 LogPrintf("Ignoring unknown configuration value %s\n", option.first);
             } else {
-                error = strprintf("Invalid configuration value %s", option.first.c_str());
+                error = strprintf("Invalid configuration value %s", option.first);
                 return false;
             }
         }
@@ -925,7 +925,7 @@ bool ArgsManager::ReadConfigFiles(std::string& error, bool ignore_invalid_keys)
                     if (!ReadConfigStream(include_config, to_include, error, ignore_invalid_keys)) {
                         return false;
                     }
-                    LogPrintf("Included configuration file %s\n", to_include.c_str());
+                    LogPrintf("Included configuration file %s\n", to_include);
                 } else {
                     error = "Failed to include configuration file " + to_include;
                     return false;
@@ -945,15 +945,15 @@ bool ArgsManager::ReadConfigFiles(std::string& error, bool ignore_invalid_keys)
                 }
             }
             for (const std::string& to_include : includeconf) {
-                tfm::format(std::cerr, "warning: -includeconf cannot be used from included files; ignoring -includeconf=%s\n", to_include.c_str());
+                tfm::format(std::cerr, "warning: -includeconf cannot be used from included files; ignoring -includeconf=%s\n", to_include);
             }
         }
     }
 
     // If datadir is changed in .conf file:
     ClearDatadirCache();
     if (!CheckDataDirOption()) {
-        error = strprintf("specified data directory \"%s\" does not exist.", gArgs.GetArg("-datadir", "").c_str());
+        error = strprintf("specified data directory \"%s\" does not exist.", gArgs.GetArg("-datadir", ""));
         return false;
     }
     return true;
diff --git a/src/wallet/wallettool.cpp b/src/wallet/wallettool.cpp
@@ -30,7 +30,7 @@ static std::shared_ptr<CWallet> CreateWallet(const std::string& name, const fs::
     bool first_run = true;
     DBErrors load_wallet_ret = wallet_instance->LoadWallet(first_run);
     if (load_wallet_ret != DBErrors::LOAD_OK) {
-        tfm::format(std::cerr, "Error creating %s", name.c_str());
+        tfm::format(std::cerr, "Error creating %s", name);
         return nullptr;
     }
 
@@ -59,28 +59,28 @@ static std::shared_ptr<CWallet> LoadWallet(const std::string& name, const fs::pa
         bool first_run;
         load_wallet_ret = wallet_instance->LoadWallet(first_run);
     } catch (const std::runtime_error&) {
-        tfm::format(std::cerr, "Error loading %s. Is wallet being used by another process?\n", name.c_str());
+        tfm::format(std::cerr, "Error loading %s. Is wallet being used by another process?\n", name);
         return nullptr;
     }
 
     if (load_wallet_ret != DBErrors::LOAD_OK) {
         wallet_instance = nullptr;
         if (load_wallet_ret == DBErrors::CORRUPT) {
-            tfm::format(std::cerr, "Error loading %s: Wallet corrupted", name.c_str());
+            tfm::format(std::cerr, "Error loading %s: Wallet corrupted", name);
             return nullptr;
         } else if (load_wallet_ret == DBErrors::NONCRITICAL_ERROR) {
             tfm::format(std::cerr, "Error reading %s! All keys read correctly, but transaction data"
                             " or address book entries might be missing or incorrect.",
-                name.c_str());
+                name);
         } else if (load_wallet_ret == DBErrors::TOO_NEW) {
             tfm::format(std::cerr, "Error loading %s: Wallet requires newer version of %s",
-                name.c_str(), PACKAGE_NAME);
+                name, PACKAGE_NAME);
             return nullptr;
         } else if (load_wallet_ret == DBErrors::NEED_REWRITE) {
             tfm::format(std::cerr, "Wallet needed to be rewritten: restart %s to complete", PACKAGE_NAME);
             return nullptr;
         } else {
-            tfm::format(std::cerr, "Error loading %s", name.c_str());
+            tfm::format(std::cerr, "Error loading %s", name);
             return nullptr;
         }
     }
@@ -112,20 +112,20 @@ bool ExecuteWalletToolFunc(const std::string& command, const std::string& name)
         }
     } else if (command == "info") {
         if (!fs::exists(path)) {
-            tfm::format(std::cerr, "Error: no wallet file at %s\n", name.c_str());
+            tfm::format(std::cerr, "Error: no wallet file at %s\n", name);
             return false;
         }
         std::string error;
         if (!WalletBatch::VerifyEnvironment(path, error)) {
-            tfm::format(std::cerr, "Error loading %s. Is wallet being used by other process?\n", name.c_str());
+            tfm::format(std::cerr, "Error loading %s. Is wallet being used by other process?\n", name);
             return false;
         }
         std::shared_ptr<CWallet> wallet_instance = LoadWallet(name, path);
         if (!wallet_instance) return false;
         WalletShowInfo(wallet_instance.get());
         wallet_instance->Flush(true);
     } else {
-        tfm::format(std::cerr, "Invalid command: %s\n", command.c_str());
+        tfm::format(std::cerr, "Invalid command: %s\n", command);
         return false;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ int main(int argc, char** argv)`
`36`	`36`	`SetupBenchArgs();`
`37`	`37`	`std::string error;`
`38`	`38`	`if (!gArgs.ParseParameters(argc, argv, error)) {`
`39`		`- tfm::format(std::cerr, "Error parsing command line arguments: %s\n", error.c_str());`
	`39`	`+ tfm::format(std::cerr, "Error parsing command line arguments: %s\n", error);`
`40`	`40`	`return EXIT_FAILURE;`
`41`	`41`	`}`
`42`	`42`
`@@ -60,7 +60,7 @@ int main(int argc, char** argv)`
`60`	`60`
`61`	`61`	`double scaling_factor;`
`62`	`62`	`if (!ParseDouble(scaling_str, &scaling_factor)) {`
`63`		`- tfm::format(std::cerr, "Error parsing scaling factor as double: %s\n", scaling_str.c_str());`
	`63`	`+ tfm::format(std::cerr, "Error parsing scaling factor as double: %s\n", scaling_str);`
`64`	`64`	`return EXIT_FAILURE;`
`65`	`65`	`}`
`66`	`66`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ static int AppInitRPC(int argc, char* argv[])`
`105`	`105`	`SetupCliArgs();`
`106`	`106`	`std::string error;`
`107`	`107`	`if (!gArgs.ParseParameters(argc, argv, error)) {`
`108`		`- tfm::format(std::cerr, "Error parsing command line arguments: %s\n", error.c_str());`
	`108`	`+ tfm::format(std::cerr, "Error parsing command line arguments: %s\n", error);`
`109`	`109`	`return EXIT_FAILURE;`
`110`	`110`	`}`
`111`	`111`	`if (argc < 2 \|\| HelpRequested(gArgs) \|\| gArgs.IsArgSet("-version")) {`
`@@ -119,19 +119,19 @@ static int AppInitRPC(int argc, char* argv[])`
`119`	`119`	`strUsage += "\n" + gArgs.GetHelpMessage();`
`120`	`120`	`}`
`121`	`121`
`122`		`- tfm::format(std::cout, "%s", strUsage.c_str());`
	`122`	`+ tfm::format(std::cout, "%s", strUsage);`
`123`	`123`	`if (argc < 2) {`
`124`	`124`	`tfm::format(std::cerr, "Error: too few parameters\n");`
`125`	`125`	`return EXIT_FAILURE;`
`126`	`126`	`}`
`127`	`127`	`return EXIT_SUCCESS;`
`128`	`128`	`}`
`129`	`129`	`if (!CheckDataDirOption()) {`
`130`		`- tfm::format(std::cerr, "Error: Specified data directory \"%s\" does not exist.\n", gArgs.GetArg("-datadir", "").c_str());`
	`130`	`+ tfm::format(std::cerr, "Error: Specified data directory \"%s\" does not exist.\n", gArgs.GetArg("-datadir", ""));`
`131`	`131`	`return EXIT_FAILURE;`
`132`	`132`	`}`
`133`	`133`	`if (!gArgs.ReadConfigFiles(error, true)) {`
`134`		`- tfm::format(std::cerr, "Error reading configuration file: %s\n", error.c_str());`
	`134`	`+ tfm::format(std::cerr, "Error reading configuration file: %s\n", error);`
`135`	`135`	`return EXIT_FAILURE;`
`136`	`136`	`}`
`137`	`137`	`// Check for -chain, -testnet or -regtest parameter (BaseParams() calls are only valid after this clause)`
`@@ -393,7 +393,7 @@ static UniValue CallRPC(BaseRequestHandler *rh, const std::string& strMethod, co`
`393`	`393`	`if (failedToGetAuthCookie) {`
`394`	`394`	`throw std::runtime_error(strprintf(`
`395`	`395`	`"Could not locate RPC credentials. No authentication cookie could be found, and RPC password is not set. See -rpcpassword and -stdinrpcpass. Configuration file: (%s)",`
`396`		`- GetConfigFile(gArgs.GetArg("-conf", BITCOIN_CONF_FILENAME)).string().c_str()));`
	`396`	`+ GetConfigFile(gArgs.GetArg("-conf", BITCOIN_CONF_FILENAME)).string()));`
`397`	`397`	`} else {`
`398`	`398`	`throw std::runtime_error("Authorization failed: Incorrect rpcuser or rpcpassword");`
`399`	`399`	`}`
`@@ -541,7 +541,7 @@ static int CommandLineRPC(int argc, char *argv[])`
`541`	`541`	`}`
`542`	`542`
`543`	`543`	`if (strPrint != "") {`
`544`		`- tfm::format(nRet == 0 ? std::cout : std::cerr, "%s\n", strPrint.c_str());`
	`544`	`+ tfm::format(nRet == 0 ? std::cout : std::cerr, "%s\n", strPrint);`
`545`	`545`	`}`
`546`	`546`	`return nRet;`
`547`	`547`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ static int AppInitRawTx(int argc, char* argv[])`
`83`	`83`	`SetupBitcoinTxArgs();`
`84`	`84`	`std::string error;`
`85`	`85`	`if (!gArgs.ParseParameters(argc, argv, error)) {`
`86`		`- tfm::format(std::cerr, "Error parsing command line arguments: %s\n", error.c_str());`
	`86`	`+ tfm::format(std::cerr, "Error parsing command line arguments: %s\n", error);`
`87`	`87`	`return EXIT_FAILURE;`
`88`	`88`	`}`
`89`	`89`
`@@ -105,7 +105,7 @@ static int AppInitRawTx(int argc, char* argv[])`
`105`	`105`	`"\n";`
`106`	`106`	`strUsage += gArgs.GetHelpMessage();`
`107`	`107`
`108`		`- tfm::format(std::cout, "%s", strUsage.c_str());`
	`108`	`+ tfm::format(std::cout, "%s", strUsage);`
`109`	`109`
`110`	`110`	`if (argc < 2) {`
`111`	`111`	`tfm::format(std::cerr, "Error: too few parameters\n");`
`@@ -724,21 +724,21 @@ static void OutputTxJSON(const CTransaction& tx)`
`724`	`724`	`TxToUniv(tx, uint256(), entry);`
`725`	`725`
`726`	`726`	`std::string jsonOutput = entry.write(4);`
`727`		`- tfm::format(std::cout, "%s\n", jsonOutput.c_str());`
	`727`	`+ tfm::format(std::cout, "%s\n", jsonOutput);`
`728`	`728`	`}`
`729`	`729`
`730`	`730`	`static void OutputTxHash(const CTransaction& tx)`
`731`	`731`	`{`
`732`	`732`	`std::string strHexHash = tx.GetHash().GetHex(); // the hex-encoded transaction hash (aka the transaction id)`
`733`	`733`
`734`		`- tfm::format(std::cout, "%s\n", strHexHash.c_str());`
	`734`	`+ tfm::format(std::cout, "%s\n", strHexHash);`
`735`	`735`	`}`
`736`	`736`
`737`	`737`	`static void OutputTxHex(const CTransaction& tx)`
`738`	`738`	`{`
`739`	`739`	`std::string strHex = EncodeHexTx(tx);`
`740`	`740`
`741`		`- tfm::format(std::cout, "%s\n", strHex.c_str());`
	`741`	`+ tfm::format(std::cout, "%s\n", strHex);`
`742`	`742`	`}`
`743`	`743`
`744`	`744`	`static void OutputTx(const CTransaction& tx)`
`@@ -829,7 +829,7 @@ static int CommandLineRawTx(int argc, char* argv[])`
`829`	`829`	`}`
`830`	`830`
`831`	`831`	`if (strPrint != "") {`
`832`		`- tfm::format(nRet == 0 ? std::cout : std::cerr, "%s\n", strPrint.c_str());`
	`832`	`+ tfm::format(nRet == 0 ? std::cout : std::cerr, "%s\n", strPrint);`
`833`	`833`	`}`
`834`	`834`	`return nRet;`
`835`	`835`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ static bool AppInit(int argc, char* argv[])`
`70`	`70`	`strUsage += "\n" + gArgs.GetHelpMessage();`
`71`	`71`	`}`
`72`	`72`
`73`		`- tfm::format(std::cout, "%s", strUsage.c_str());`
	`73`	`+ tfm::format(std::cout, "%s", strUsage);`
`74`	`74`	`return true;`
`75`	`75`	`}`
`76`	`76`
Original file line number	Diff line number	Diff line change
`@@ -943,7 +943,7 @@ bool AppInitParameterInteraction()`
`943`	`943`	`}`
`944`	`944`
`945`	`945`	`if (!fs::is_directory(GetBlocksDir())) {`
`946`		`- return InitError(strprintf(_("Specified blocks directory \"%s\" does not exist.").translated, gArgs.GetArg("-blocksdir", "").c_str()));`
	`946`	`+ return InitError(strprintf(_("Specified blocks directory \"%s\" does not exist.").translated, gArgs.GetArg("-blocksdir", "")));`
`947`	`947`	`}`
`948`	`948`
`949`	`949`	`// parse and validate enabled filter types`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ bool noui_ThreadSafeMessageBox(const std::string& message, const std::string& ca`
`45`	`45`	`if (!fSecure) {`
`46`	`46`	`LogPrintf("%s%s\n", strCaption, message);`
`47`	`47`	`}`
`48`		`- tfm::format(std::cerr, "%s%s\n", strCaption.c_str(), message.c_str());`
	`48`	`+ tfm::format(std::cerr, "%s%s\n", strCaption, message);`
`49`	`49`	`return false;`
`50`	`50`	`}`
`51`	`51`
`@@ -96,4 +96,4 @@ void noui_reconnect()`
`96`	`96`	`noui_ThreadSafeQuestionConn.disconnect();`
`97`	`97`	`noui_InitMessageConn.disconnect();`
`98`	`98`	`noui_connect();`
`99`		`-}`
	`99`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -517,7 +517,7 @@ void CBlockPolicyEstimator::processTransaction(const CTxMemPoolEntry& entry, boo`
`517`	`517`	`uint256 hash = entry.GetTx().GetHash();`
`518`	`518`	`if (mapMemPoolTxs.count(hash)) {`
`519`	`519`	`LogPrint(BCLog::ESTIMATEFEE, "Blockpolicy error mempool tx %s already being tracked\n",`
`520`		`- hash.ToString().c_str());`
	`520`	`+ hash.ToString());`
`521`	`521`	`return;`
`522`	`522`	`}`
`523`	`523`
Original file line number	Diff line number	Diff line change
`@@ -1602,7 +1602,7 @@ UniValue joinpsbts(const JSONRPCRequest& request)`
`1602`	`1602`	`for (auto& psbt : psbtxs) {`
`1603`	`1603`	`for (unsigned int i = 0; i < psbt.tx->vin.size(); ++i) {`
`1604`	`1604`	`if (!merged_psbt.AddInput(psbt.tx->vin[i], psbt.inputs[i])) {`
`1605`		`- throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Input %s:%d exists in multiple PSBTs", psbt.tx->vin[i].prevout.hash.ToString().c_str(), psbt.tx->vin[i].prevout.n));`
	`1605`	`+ throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Input %s:%d exists in multiple PSBTs", psbt.tx->vin[i].prevout.hash.ToString(), psbt.tx->vin[i].prevout.n));`
`1606`	`1606`	`}`
`1607`	`1607`	`}`
`1608`	`1608`	`for (unsigned int i = 0; i < psbt.tx->vout.size(); ++i) {`