scripted-diff: test: rename strCmd to command

luke-jr · luke-jr · commit 849c19a47ed4 · 2021-06-29T19:13:32.000Z
-BEGIN VERIFY SCRIPT-
sed -i 's/\bstrCmd\b/command/g' $(git grep -l strCmd)
-END VERIFY SCRIPT-
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -1347,18 +1347,18 @@ static void AlertNotify(const std::string& strMessage)
 {
     uiInterface.NotifyAlertChanged();
 #if HAVE_SYSTEM
-    std::string strCmd = gArgs.GetArg("-alertnotify", "");
-    if (strCmd.empty()) return;
+    std::string command = gArgs.GetArg("-alertnotify", "");
+    if (command.empty()) return;
 
     // Alert text should be plain ascii coming from a trusted source, but to
     // be safe we first strip anything not in safeChars, then add single quotes around
     // the whole string before passing it to the shell:
     std::string singleQuote("'");
     std::string safeStatus = SanitizeString(strMessage);
     safeStatus = singleQuote+safeStatus+singleQuote;
-    boost::replace_all(strCmd, "%s", safeStatus);
+    boost::replace_all(command, "%s", safeStatus);
 
-    std::thread t(runCommand, strCmd);
+    std::thread t(runCommand, command);
     t.detach(); // thread runs free
 #endif
 }
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -939,28 +939,28 @@ CWalletTx* CWallet::AddToWallet(CTransactionRef tx, const CWalletTx::Confirmatio
 
 #if HAVE_SYSTEM
     // notify an external script when a wallet transaction comes in or is updated
-    std::string strCmd = gArgs.GetArg("-walletnotify", "");
+    std::string command = gArgs.GetArg("-walletnotify", "");
 
-    if (!strCmd.empty())
+    if (!command.empty())
     {
-        boost::replace_all(strCmd, "%s", hash.GetHex());
+        boost::replace_all(command, "%s", hash.GetHex());
         if (confirm.status == CWalletTx::Status::CONFIRMED)
         {
-            boost::replace_all(strCmd, "%b", confirm.hashBlock.GetHex());
-            boost::replace_all(strCmd, "%h", ToString(confirm.block_height));
+            boost::replace_all(command, "%b", confirm.hashBlock.GetHex());
+            boost::replace_all(command, "%h", ToString(confirm.block_height));
         } else {
-            boost::replace_all(strCmd, "%b", "unconfirmed");
-            boost::replace_all(strCmd, "%h", "-1");
+            boost::replace_all(command, "%b", "unconfirmed");
+            boost::replace_all(command, "%h", "-1");
         }
 #ifndef WIN32
         // Substituting the wallet name isn't currently supported on windows
         // because windows shell escaping has not been implemented yet:
         // https://github.com/bitcoin/bitcoin/pull/13339#issuecomment-537384875
         // A few ways it could be implemented in the future are described in:
         // https://github.com/bitcoin/bitcoin/pull/13339#issuecomment-461288094
-        boost::replace_all(strCmd, "%w", ShellEscape(GetName()));
+        boost::replace_all(command, "%w", ShellEscape(GetName()));
 #endif
-        std::thread t(runCommand, strCmd);
+        std::thread t(runCommand, command);
         t.detach(); // thread runs free
     }
 #endif
