aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2016-01-04 10:10:41 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2016-01-04 10:17:09 +0100
commitac982a16e07db65e255d8de32100c7da9cb6f4e7 (patch)
tree512adf0ab8e95fb96f4a8ef2b7a1765fbc293331 /src
parentc17301382159ce70eb647cbb87458c08ed75cc56 (diff)
parenta5a0831458d8290c1e7591cf32a529669b613d86 (diff)
Merge pull request #7263
a5a0831 Double semicolon cleanup. (21E14)
Diffstat (limited to 'src')
-rw-r--r--src/main.cpp4
-rw-r--r--src/net.cpp2
-rw-r--r--src/qt/bantablemodel.cpp4
-rw-r--r--src/qt/guiutil.cpp2
-rw-r--r--src/qt/peertablemodel.cpp2
-rw-r--r--src/test/rpc_tests.cpp4
6 files changed, 9 insertions, 9 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 0766b1458b..8f3cea64ac 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -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);
/**
diff --git a/src/net.cpp b/src/net.cpp
index e0d96a2dc8..2ad20ac224 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -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
}
diff --git a/src/qt/bantablemodel.cpp b/src/qt/bantablemodel.cpp
index 33792af5ba..d95106b5ac 100644
--- a/src/qt/bantablemodel.cpp
+++ b/src/qt/bantablemodel.cpp
@@ -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;
-} \ No newline at end of file
+}
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
index 34675b53dc..f7b610dbb8 100644
--- a/src/qt/guiutil.cpp
+++ b/src/qt/guiutil.cpp
@@ -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++;
}
diff --git a/src/qt/peertablemodel.cpp b/src/qt/peertablemodel.cpp
index 94837679d8..df8f4f07fc 100644
--- a/src/qt/peertablemodel.cpp
+++ b/src/qt/peertablemodel.cpp
@@ -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
diff --git a/src/test/rpc_tests.cpp b/src/test/rpc_tests.cpp
index ce22975005..58b34cbfa7 100644
--- a/src/test/rpc_tests.cpp
+++ b/src/test/rpc_tests.cpp
@@ -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);