diff options
| author | practicalswift <practicalswift@users.noreply.github.com> | 2018-03-25 22:49:33 +0200 |
|---|---|---|
| committer | practicalswift <practicalswift@users.noreply.github.com> | 2018-03-26 12:08:08 +0200 |
| commit | 6a318e48a67a8f9834e14c960bd4f5b6e295b2dc (patch) | |
| tree | bc7803e9200604881fc9059ba3d5e23da8d0e563 | |
| parent | 7466a26cab5d66665991433947964a638f5b957e (diff) | |
Reduce variable scopes
| -rw-r--r-- | src/qt/recentrequeststablemodel.cpp | 3 | ||||
| -rw-r--r-- | src/test/test_bitcoin.cpp | 2 | ||||
| -rw-r--r-- | src/test/util_tests.cpp | 3 |
3 files changed, 3 insertions, 5 deletions
diff --git a/src/qt/recentrequeststablemodel.cpp b/src/qt/recentrequeststablemodel.cpp index 0dd7d46960..f045053c3b 100644 --- a/src/qt/recentrequeststablemodel.cpp +++ b/src/qt/recentrequeststablemodel.cpp @@ -139,10 +139,9 @@ bool RecentRequestsTableModel::removeRows(int row, int count, const QModelIndex if(count > 0 && row >= 0 && (row+count) <= list.size()) { - const RecentRequestEntry *rec; for (int i = 0; i < count; ++i) { - rec = &list[row+i]; + const RecentRequestEntry* rec = &list[row+i]; if (!walletModel->saveReceiveRequest(rec->recipient.address.toStdString(), rec->id, "")) return false; } diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp index 95c4825b84..9390a93b99 100644 --- a/src/test/test_bitcoin.cpp +++ b/src/test/test_bitcoin.cpp @@ -145,9 +145,9 @@ TestChain100Setup::CreateAndProcessBlock(const std::vector<CMutableTransaction>& for (const CMutableTransaction& tx : txns) block.vtx.push_back(MakeTransactionRef(tx)); // IncrementExtraNonce creates a valid coinbase and merkleRoot - unsigned int extraNonce = 0; { LOCK(cs_main); + unsigned int extraNonce = 0; IncrementExtraNonce(&block, chainActive.Tip(), extraNonce); } diff --git a/src/test/util_tests.cpp b/src/test/util_tests.cpp index b6f3cbe2b7..b0c5c53016 100644 --- a/src/test/util_tests.cpp +++ b/src/test/util_tests.cpp @@ -704,9 +704,8 @@ static constexpr char ExitCommand = 'X'; static void TestOtherProcess(fs::path dirname, std::string lockname, int fd) { char ch; - int rv; while (true) { - rv = read(fd, &ch, 1); // Wait for command + int rv = read(fd, &ch, 1); // Wait for command assert(rv == 1); switch(ch) { case LockCommand: |