From 8198665eca2d338c7484b5cfeef9e976fc830b28 Mon Sep 17 00:00:00 2001
From: Vlad Gluhovsky <gluk256@gmail.com>
Date: Wed, 17 Jun 2015 13:10:10 +0200
Subject: [PATCH] minor improvements

---
 libwhisper/BloomFilter.cpp | 9 +++------
 libwhisper/Common.cpp      | 8 ++++----
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/libwhisper/BloomFilter.cpp b/libwhisper/BloomFilter.cpp
index c189ee912..cff69c664 100644
--- a/libwhisper/BloomFilter.cpp
+++ b/libwhisper/BloomFilter.cpp
@@ -35,11 +35,8 @@ void TopicBloomFilter::addRaw(AbridgedTopic const& _h)
 		{
 			if (m_refCounter[i] != numeric_limits<uint16_t>::max())
 				m_refCounter[i]++;
-			//else: overflow
-
-			// in order to encounter overflow, you have to set at least 65536 filters simultaneously.
-			// even then, the problem will only arise after at least 65536 filters will be be removed.
-			// we assume, it will never happen.
+			else
+				BOOST_THROW_EXCEPTION(Overflow());
 		}
 }
 
@@ -52,7 +49,7 @@ void TopicBloomFilter::removeRaw(AbridgedTopic const& _h)
 				m_refCounter[i]--;
 
 			if (!m_refCounter[i])
-				(*this)[i/8] &= ~c_mask[i%8];
+				(*this)[i / 8] &= ~c_mask[i % 8];
 		}
 }
 
diff --git a/libwhisper/Common.cpp b/libwhisper/Common.cpp
index 5dc267fcf..7f5b8ed06 100644
--- a/libwhisper/Common.cpp
+++ b/libwhisper/Common.cpp
@@ -38,7 +38,7 @@ AbridgedTopics dev::shh::abridge(Topics const& _topics)
 {
 	AbridgedTopics ret;
 	ret.reserve(_topics.size());
-	for (auto const& t : _topics)
+	for (auto const& t: _topics)
 		ret.push_back(abridge(t));
 	return ret;
 }
@@ -87,10 +87,10 @@ bool TopicFilter::matches(Envelope const& _e) const
 
 TopicFilter::TopicFilter(RLP const& _r)
 {
-	for (RLP i: _r)
+	for (RLP const& i: _r)
 	{
 		m_topicMasks.push_back(TopicMask());
-		for (RLP j: i)
+		for (RLP const& j: i)
 			m_topicMasks.back().push_back(j.toPair<FixedHash<4>, FixedHash<4>>());
 	}
 }
@@ -99,7 +99,7 @@ AbridgedTopic TopicFilter::exportBloom() const
 {
 	AbridgedTopic ret;
 	for (TopicMask const& t: m_topicMasks)
-		for (auto i: t)
+		for (auto const& i: t)
 			ret |= i.first.template bloomPart<TopicBloomFilter::BitsPerBloom, TopicBloomFilter::size>();		
 		
 	return ret;