From 3874c78d068acf1328394883abcf56fec7f36ed7 Mon Sep 17 00:00:00 2001 From: Lefteris Karapetsas Date: Wed, 4 Mar 2015 11:53:11 +0100 Subject: [PATCH] More style fixes --- libdevcore/StructuredLogger.cpp | 12 ++++++++---- libethereum/BlockChain.cpp | 3 ++- libp2p/Host.cpp | 3 ++- libp2p/Host.h | 3 ++- libwebthree/WebThree.h | 2 +- 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/libdevcore/StructuredLogger.cpp b/libdevcore/StructuredLogger.cpp index cb6acd501..d93a9496e 100644 --- a/libdevcore/StructuredLogger.cpp +++ b/libdevcore/StructuredLogger.cpp @@ -80,7 +80,8 @@ void StructuredLogger::stopping(string const& _clientImpl, const char* _ethVersi } } -void StructuredLogger::p2pConnected(string const& _id, +void StructuredLogger::p2pConnected( + string const& _id, bi::tcp::endpoint const& _addr, chrono::system_clock::time_point const& _ts, string const& _remoteVersion, @@ -117,7 +118,8 @@ void StructuredLogger::p2pDisconnected(string const& _id, bi::tcp::endpoint cons } } -void StructuredLogger::minedNewBlock(string const& _hash, +void StructuredLogger::minedNewBlock( + string const& _hash, string const& _blockNumber, string const& _chainHeadHash, string const& _prevHash) @@ -135,7 +137,8 @@ void StructuredLogger::minedNewBlock(string const& _hash, } } -void StructuredLogger::chainReceivedNewBlock(string const& _hash, +void StructuredLogger::chainReceivedNewBlock( + string const& _hash, string const& _blockNumber, string const& _chainHeadHash, string const& _remoteID, @@ -155,7 +158,8 @@ void StructuredLogger::chainReceivedNewBlock(string const& _hash, } } -void StructuredLogger::chainNewHead(string const& _hash, +void StructuredLogger::chainNewHead( + string const& _hash, string const& _blockNumber, string const& _chainHeadHash, string const& _prevHash) diff --git a/libethereum/BlockChain.cpp b/libethereum/BlockChain.cpp index 784621a69..aabce4d4b 100644 --- a/libethereum/BlockChain.cpp +++ b/libethereum/BlockChain.cpp @@ -323,7 +323,8 @@ h256s BlockChain::import(bytes const& _block, OverlayDB const& _db) bi.nonce.abridged(), currentHash().abridged(), "", // TODO: remote id ?? - bi.parentHash.abridged()); + bi.parentHash.abridged() + ); // cnote << "Parent " << bi.parentHash << " has " << details(bi.parentHash).children.size() << " children."; h256s ret; diff --git a/libp2p/Host.cpp b/libp2p/Host.cpp index bb97f06e4..a4f7bcd92 100644 --- a/libp2p/Host.cpp +++ b/libp2p/Host.cpp @@ -164,7 +164,8 @@ void Host::registerPeer(std::shared_ptr _s, CapDescs const& _caps) _s->m_peer->peerEndpoint(), _s->m_peer->m_lastConnected, _s->m_info.clientVersion, - peerCount()); + peerCount() + ); RecursiveGuard l(x_sessions); // TODO: temporary loose-coupling; if m_peers already has peer, // it is same as _s->m_peer. (fixing next PR) diff --git a/libp2p/Host.h b/libp2p/Host.h index 0eefa6f90..48e678030 100644 --- a/libp2p/Host.h +++ b/libp2p/Host.h @@ -85,7 +85,8 @@ class Host: public Worker public: /// Start server, listening for connections on the given port. - Host(std::string const& _clientVersion, + Host( + std::string const& _clientVersion, NetworkPreferences const& _n = NetworkPreferences(), bytesConstRef _restoreNetwork = bytesConstRef() ); diff --git a/libwebthree/WebThree.h b/libwebthree/WebThree.h index 66cd4c556..4a3bee59b 100644 --- a/libwebthree/WebThree.h +++ b/libwebthree/WebThree.h @@ -105,7 +105,7 @@ public: /// ethereum() may be safely static_cast()ed to a eth::Client*. WebThreeDirect( std::string const& _clientVersion, - std::string const& _dbPath, + std::string const& _dbPath, bool _forceClean = false, std::set const& _interfaces = {"eth", "shh"}, p2p::NetworkPreferences const& _n = p2p::NetworkPreferences(),