diff --git a/src/qt/recentrequeststablemodel.cpp b/src/qt/recentrequeststablemodel.cpp --- a/src/qt/recentrequeststablemodel.cpp +++ b/src/qt/recentrequeststablemodel.cpp @@ -134,12 +134,12 @@ Q_UNUSED(parent); 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, "")) + rec->recipient.address.toStdString(), rec->id, "")) { return false; + } } beginRemoveRows(parent, row, row + count - 1); diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp --- a/src/test/test_bitcoin.cpp +++ b/src/test/test_bitcoin.cpp @@ -182,9 +182,9 @@ }); // IncrementExtraNonce creates a valid coinbase and merkleRoot - unsigned int extraNonce = 0; { LOCK(cs_main); + unsigned int extraNonce = 0; IncrementExtraNonce(config, &block, chainActive.Tip(), extraNonce); } diff --git a/src/test/util_tests.cpp b/src/test/util_tests.cpp --- a/src/test/util_tests.cpp +++ b/src/test/util_tests.cpp @@ -1205,9 +1205,9 @@ 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 + // Wait for command + int rv = read(fd, &ch, 1); assert(rv == 1); switch (ch) { case LockCommand: