From 73fae6bf0a57dc627cc5196d0c7abb87b76c9d6e Mon Sep 17 00:00:00 2001 From: Larry Ruane Date: Thu, 25 Jun 2020 09:32:36 -0600 Subject: [PATCH] review, cleanup: eliminate uninitialized variable --- src/wallet/wallet.cpp | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 5f6ea468a..13b0adf56 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -4654,20 +4654,14 @@ bool CWallet::InitLoadWallet(bool clearWitnessCaches) RegisterValidationInterface(walletInstance); - CBlockIndex *pindexRescan; - if (clearWitnessCaches || GetBoolArg("-rescan", false)) - { + CBlockIndex *pindexRescan = chainActive.Genesis(); + if (clearWitnessCaches || GetBoolArg("-rescan", false)) { walletInstance->ClearNoteWitnessCache(); - pindexRescan = chainActive.Genesis(); - } - else - { + } else { CWalletDB walletdb(walletFile); CBlockLocator locator; if (walletdb.ReadBestBlock(locator)) pindexRescan = FindForkInGlobalIndex(chainActive, locator); - else - pindexRescan = chainActive.Genesis(); } if (chainActive.Tip() && chainActive.Tip() != pindexRescan) {