LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Merge #12780: Reduce variable scopes

Browse source 
6a318e48a6 Reduce variable scopes (practicalswift)

Pull request description:

  Reduce variable scopes.

Tree-SHA512: 5c7735344024cb6cd310e739886dc811a64b640a0d6aac8b3d04f49e5987d6ff6676d978890bc84f1460527d92217176a79b007f0bf6b4147c04abfec2c67714
This commit is contained in:
MarcoFalke 2018-03-30 11:40:45 -04:00
commit be299c4a47
No known key found for this signature in database
GPG key ID: D2EA4850E7528B25
3 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/qt/recentrequeststablemodel.cpp
View file

@ -139,10 +139,9 @@ bool RecentRequestsTableModel::removeRows(int row, int count, const QModelIndex
if(count > 0 && row >= 0 && (row+count) <= list.size()) if(count > 0 && row >= 0 && (row+count) <= list.size())
{ {
const RecentRequestEntry *rec;
for (int i = 0; i < count; ++i) 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, "")) if (!walletModel->saveReceiveRequest(rec->recipient.address.toStdString(), rec->id, ""))
return false; return false;
} }

2
src/test/test_bitcoin.cpp
View file

@ -145,9 +145,9 @@ TestChain100Setup::CreateAndProcessBlock(const std::vector<CMutableTransaction>&
for (const CMutableTransaction& tx : txns) for (const CMutableTransaction& tx : txns)
block.vtx.push_back(MakeTransactionRef(tx)); block.vtx.push_back(MakeTransactionRef(tx));
// IncrementExtraNonce creates a valid coinbase and merkleRoot // IncrementExtraNonce creates a valid coinbase and merkleRoot
unsigned int extraNonce = 0;
{ {
LOCK(cs_main); LOCK(cs_main);
unsigned int extraNonce = 0;
IncrementExtraNonce(&block, chainActive.Tip(), extraNonce); IncrementExtraNonce(&block, chainActive.Tip(), extraNonce);
} }

3
src/test/util_tests.cpp
View file

@ -704,9 +704,8 @@ static constexpr char ExitCommand = 'X';
static void TestOtherProcess(fs::path dirname, std::string lockname, int fd) static void TestOtherProcess(fs::path dirname, std::string lockname, int fd)
{ {
char ch; char ch;
int rv;
while (true) { while (true) {
rv = read(fd, &ch, 1); // Wait for command int rv = read(fd, &ch, 1); // Wait for command
assert(rv == 1); assert(rv == 1);
switch(ch) { switch(ch) {
case LockCommand: case LockCommand: