fix: adjust wallet/bip39 accordingly linter comments

knst · knst · commit 2c74ad427d40 · 2024-03-24T00:41:23.000+07:00
diff --git a/src/wallet/bip39.cpp b/src/wallet/bip39.cpp
@@ -60,10 +60,9 @@ SecureString CMnemonic::FromData(const SecureVector& data, int len)
     int mlen = len * 3 / 4;
     SecureString mnemonic;
 
-    int i, j, idx;
-    for (i = 0; i < mlen; i++) {
-        idx = 0;
-        for (j = 0; j < 11; j++) {
+    for (int i = 0; i < mlen; i++) {
+        int idx = 0;
+        for (int j = 0; j < 11; j++) {
             idx <<= 1;
             idx += (bits[(i * 11 + j) / 8] & (1 << (7 - ((i * 11 + j) % 8)))) > 0;
         }
@@ -76,7 +75,7 @@ SecureString CMnemonic::FromData(const SecureVector& data, int len)
     return mnemonic;
 }
 
-bool CMnemonic::Check(SecureString mnemonic)
+bool CMnemonic::Check(const SecureString& mnemonic)
 {
     if (mnemonic.empty()) {
         return false;
@@ -98,7 +97,7 @@ bool CMnemonic::Check(SecureString mnemonic)
     SecureString ssCurrentWord;
     SecureVector bits(32 + 1);
 
-    uint32_t nWordIndex, ki, nBitsCount{};
+    uint32_t ki, nBitsCount{};
 
     for (size_t i = 0; i < mnemonic.size(); ++i)
     {
@@ -110,7 +109,7 @@ bool CMnemonic::Check(SecureString mnemonic)
             ssCurrentWord += mnemonic[i + ssCurrentWord.size()];
         }
         i += ssCurrentWord.size();
-        nWordIndex = 0;
+        uint32_t nWordIndex = 0;
         for (;;) {
             if (!wordlist[nWordIndex]) { // word not found
                 return false;
@@ -140,7 +139,7 @@ bool CMnemonic::Check(SecureString mnemonic)
 }
 
 // passphrase must be at most 256 characters otherwise it would be truncated
-void CMnemonic::ToSeed(SecureString mnemonic, SecureString passphrase, SecureVector& seedRet)
+void CMnemonic::ToSeed(const SecureString& mnemonic, const SecureString& passphrase, SecureVector& seedRet)
 {
     SecureString ssSalt = SecureString("mnemonic") + passphrase;
     SecureVector vchSalt(ssSalt.begin(), ssSalt.begin() + strnlen(ssSalt.data(), 256));
diff --git a/src/wallet/bip39.h b/src/wallet/bip39.h
@@ -31,9 +31,9 @@ class CMnemonic
 public:
     static SecureString Generate(int strength);    // strength in bits
     static SecureString FromData(const SecureVector& data, int len);
-    static bool Check(SecureString mnemonic);
+    static bool Check(const SecureString& mnemonic);
     // passphrase must be at most 256 characters otherwise it would be truncated
-    static void ToSeed(SecureString mnemonic, SecureString passphrase, SecureVector& seedRet);
+    static void ToSeed(const SecureString& mnemonic, const SecureString& passphrase, SecureVector& seedRet);
 };
 
 #endif // BITCOIN_WALLET_BIP39_H
diff --git a/test/lint/lint-cppcheck-dash.sh b/test/lint/lint-cppcheck-dash.sh
@@ -33,6 +33,8 @@ IGNORED_WARNINGS=(
     "src/llmq/commitment.cpp.* warning: Consider using std::all_of or std::none_of algorithm instead of a raw loop. \[useStlAlgorithm\]"
     "src/rpc/.*cpp:.*: note: Function pointer used here."
     "src/masternode/sync.cpp:.*: warning: Variable 'pnode' can be declared as pointer to const \[constVariableReference\]"
+    "src/wallet/bip39.cpp.*: warning: The scope of the variable 'ssCurrentWord' can be reduced. \[variableScope\]"
+
 
     "src/stacktraces.cpp:.*: .*: Parameter 'info' can be declared as pointer to const"
     "src/stacktraces.cpp:.*: note: You might need to cast the function pointer here"
