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

Merge pull request #7263

Browse source 
a5a0831 Double semicolon cleanup. (21E14)
This commit is contained in:
Wladimir J. van der Laan 2016-01-04 10:10:41 +01:00
commit ac982a16e0
No known key found for this signature in database
GPG key ID: 74810B012346C9A6
6 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main.cpp
View file

@ -84,8 +84,8 @@ struct COrphanTx {
CTransaction tx;
NodeId fromPeer;
};
map<uint256, COrphanTx> mapOrphanTransactions GUARDED_BY(cs_main);;
map<uint256, set<uint256> > mapOrphanTransactionsByPrev GUARDED_BY(cs_main);;
map<uint256, COrphanTx> mapOrphanTransactions GUARDED_BY(cs_main);
map<uint256, set<uint256> > mapOrphanTransactionsByPrev GUARDED_BY(cs_main);
void EraseOrphansFor(NodeId peer) EXCLUSIVE_LOCKS_REQUIRED(cs_main);
/**

2
src/net.cpp
View file

@ -1370,7 +1370,7 @@ void ThreadMapPort()
LogPrintf("AddPortMapping(%s, %s, %s) failed with code %d (%s)\n",
port, port, lanaddr, r, strupnperror(r));
else
LogPrintf("UPnP Port Mapping successful.\n");;
LogPrintf("UPnP Port Mapping successful.\n");
MilliSleep(20*60*1000); // Refresh every 20 minutes
}

4
src/qt/bantablemodel.cpp
View file

@ -103,7 +103,7 @@ int BanTableModel::rowCount(const QModelIndex &parent) const
int BanTableModel::columnCount(const QModelIndex &parent) const
{
Q_UNUSED(parent);
return columns.length();;
return columns.length();
}
QVariant BanTableModel::data(const QModelIndex &index, int role) const
@ -178,4 +178,4 @@ bool BanTableModel::shouldShow()
if (priv->size() > 0)
return true;
return false;
}
}

2
src/qt/guiutil.cpp
View file

@ -225,7 +225,7 @@ QString formatBitcoinURI(const SendCoinsRecipient &info)
if (!info.message.isEmpty())
{
QString msg(QUrl::toPercentEncoding(info.message));;
QString msg(QUrl::toPercentEncoding(info.message));
ret += QString("%1message=%2").arg(paramCount == 0 ? "?" : "&").arg(msg);
paramCount++;
}

2
src/qt/peertablemodel.cpp
View file

@ -147,7 +147,7 @@ int PeerTableModel::rowCount(const QModelIndex &parent) const
int PeerTableModel::columnCount(const QModelIndex &parent) const
{
Q_UNUSED(parent);
return columns.length();;
return columns.length();
}
QVariant PeerTableModel::data(const QModelIndex &index, int role) const

4
src/test/rpc_tests.cpp
View file

@ -237,7 +237,7 @@ BOOST_AUTO_TEST_CASE(rpc_ban)
UniValue o1 = ar[0].get_obj();
UniValue adr = find_value(o1, "address");
BOOST_CHECK_EQUAL(adr.get_str(), "127.0.0.0/32");
BOOST_CHECK_NO_THROW(CallRPC(string("setban 127.0.0.0 remove")));;
BOOST_CHECK_NO_THROW(CallRPC(string("setban 127.0.0.0 remove")));
BOOST_CHECK_NO_THROW(r = CallRPC(string("listbanned")));
ar = r.get_array();
BOOST_CHECK_EQUAL(ar.size(), 0);
@ -267,7 +267,7 @@ BOOST_AUTO_TEST_CASE(rpc_ban)
// must throw an exception because 127.0.0.1 is in already banned suubnet range
BOOST_CHECK_THROW(r = CallRPC(string("setban 127.0.0.1 add")), runtime_error);
BOOST_CHECK_NO_THROW(CallRPC(string("setban 127.0.0.0/24 remove")));;
BOOST_CHECK_NO_THROW(CallRPC(string("setban 127.0.0.0/24 remove")));
BOOST_CHECK_NO_THROW(r = CallRPC(string("listbanned")));
ar = r.get_array();
BOOST_CHECK_EQUAL(ar.size(), 0);