From 1b2ac38a507c16a47474145b53f865084f5229dd Mon Sep 17 00:00:00 2001
From: hagen <hagen@mail.i2p>
Date: Wed, 1 Jun 2016 00:00:00 +0000
Subject: [PATCH] * fix compilation warnings

---
 AddressBook.cpp | 2 +-
 Daemon.cpp      | 4 ++--
 Daemon.h        | 2 --
 DaemonLinux.cpp | 2 +-
 DaemonWin32.cpp | 2 +-
 HTTP.cpp        | 3 +--
 HTTPServer.cpp  | 2 +-
 NetDb.cpp       | 3 ++-
 RouterInfo.cpp  | 2 +-
 Transports.cpp  | 2 +-
 Tunnel.cpp      | 2 +-
 Tunnel.h        | 2 +-
 12 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/AddressBook.cpp b/AddressBook.cpp
index 5a07b3c8..0dbb42d7 100644
--- a/AddressBook.cpp
+++ b/AddressBook.cpp
@@ -159,7 +159,7 @@ namespace client
 
 	int AddressBookFilesystemStorage::Save (const std::map<std::string, i2p::data::IdentHash>& addresses)
 	{
-		if (addresses.size() == 0) {
+		if (addresses.empty()) {
 			LogPrint(eLogWarning, "Addressbook: not saving empty addressbook");
 			return 0;
 		}
diff --git a/Daemon.cpp b/Daemon.cpp
index c98bce05..7ca28a6f 100644
--- a/Daemon.cpp
+++ b/Daemon.cpp
@@ -45,10 +45,10 @@ namespace i2p
 #endif	
 		};
 
-		Daemon_Singleton::Daemon_Singleton() : running(1), d(*new Daemon_Singleton_Private()) {};
+		Daemon_Singleton::Daemon_Singleton() : isDaemon(false), running(true), d(*new Daemon_Singleton_Private()) {}
 		Daemon_Singleton::~Daemon_Singleton() {
 			delete &d;
-		};
+		}
 
 		bool Daemon_Singleton::IsService () const
 		{
diff --git a/Daemon.h b/Daemon.h
index 031686f7..977d9258 100644
--- a/Daemon.h
+++ b/Daemon.h
@@ -22,9 +22,7 @@ namespace i2p
 			virtual bool stop();
 			virtual void run () {};
 
-			bool isLogging;
 			bool isDaemon;
-
 			bool running;
 
 		protected:
diff --git a/DaemonLinux.cpp b/DaemonLinux.cpp
index b408fc70..a3848c8b 100644
--- a/DaemonLinux.cpp
+++ b/DaemonLinux.cpp
@@ -45,7 +45,7 @@ namespace i2p
 	{
 		bool DaemonLinux::start()
 		{
-			if (isDaemon == 1)
+			if (isDaemon)
 			{
 				pid_t pid;
 				pid = fork();
diff --git a/DaemonWin32.cpp b/DaemonWin32.cpp
index a6d91da4..3afb70ce 100644
--- a/DaemonWin32.cpp
+++ b/DaemonWin32.cpp
@@ -45,7 +45,7 @@ namespace i2p
 				return false;
 			}
 
-			if (isDaemon == 1)
+			if (isDaemon)
 			{
 				LogPrint(eLogDebug, "Daemon: running as service");
 				I2PService service(SERVICE_NAME);
diff --git a/HTTP.cpp b/HTTP.cpp
index 3f6fd937..ee1010ec 100644
--- a/HTTP.cpp
+++ b/HTTP.cpp
@@ -406,11 +406,10 @@ namespace http {
 
   bool MergeChunkedResponse (std::istream& in, std::ostream& out) {
     std::string hexLen;
-    long int len;
     while (!in.eof ()) {
       std::getline (in, hexLen);
       errno = 0;
-      len = strtoul(hexLen.c_str(), (char **) NULL, 16);
+      long int len = strtoul(hexLen.c_str(), (char **) NULL, 16);
       if (errno != 0)
         return false; /* conversion error */
       if (len == 0)
diff --git a/HTTPServer.cpp b/HTTPServer.cpp
index 2af92057..fba4a1be 100644
--- a/HTTPServer.cpp
+++ b/HTTPServer.cpp
@@ -667,7 +667,7 @@ namespace http {
 		i2p::config::GetOption("http.auth", needAuth);
 		i2p::config::GetOption("http.user", user);
 		i2p::config::GetOption("http.pass", pass);
-	};
+	}
 
 	void HTTPConnection::Receive ()
 	{
diff --git a/NetDb.cpp b/NetDb.cpp
index 3aeff92f..d2afc50a 100644
--- a/NetDb.cpp
+++ b/NetDb.cpp
@@ -849,7 +849,8 @@ namespace data
 	template<typename Filter>
 	std::shared_ptr<const RouterInfo> NetDb::GetRandomRouter (Filter filter) const
 	{
-		if (!m_RouterInfos.size ()) return 0;
+		if (m_RouterInfos.empty())
+			return 0;
 		uint32_t ind = rand () % m_RouterInfos.size ();	
 		for (int j = 0; j < 2; j++)
 		{	
diff --git a/RouterInfo.cpp b/RouterInfo.cpp
index 2e76127c..0ef2f623 100644
--- a/RouterInfo.cpp
+++ b/RouterInfo.cpp
@@ -353,7 +353,7 @@ namespace data
 		if (m_Caps & eReachable) caps += CAPS_FLAG_REACHABLE; // reachable
 		if (m_Caps & eUnreachable) caps += CAPS_FLAG_UNREACHABLE; // unreachable
 
-		SetProperty ("caps", caps.c_str ());
+		SetProperty ("caps", caps);
 	}
 		
 	void RouterInfo::WriteToStream (std::ostream& s)
diff --git a/Transports.cpp b/Transports.cpp
index 057e2472..2d3d423f 100644
--- a/Transports.cpp
+++ b/Transports.cpp
@@ -606,7 +606,7 @@ namespace transport
 
 	std::shared_ptr<const i2p::data::RouterInfo> Transports::GetRandomPeer () const
 	{
-		if (!m_Peers.size ()) return nullptr;
+		if (m_Peers.empty ()) return nullptr;
 		std::unique_lock<std::mutex> l(m_PeersMutex);	
 		auto it = m_Peers.begin ();
 		std::advance (it, rand () % m_Peers.size ());	
diff --git a/Tunnel.cpp b/Tunnel.cpp
index ebaf98c8..1403330b 100644
--- a/Tunnel.cpp
+++ b/Tunnel.cpp
@@ -358,7 +358,7 @@ namespace tunnel
 	
 	std::shared_ptr<OutboundTunnel> Tunnels::GetNextOutboundTunnel ()
 	{
-		if (!m_OutboundTunnels.size ()) return nullptr;
+		if (m_OutboundTunnels.empty ()) return nullptr;
 		uint32_t ind = rand () % m_OutboundTunnels.size (), i = 0;
 		std::shared_ptr<OutboundTunnel> tunnel;
 		for (auto it: m_OutboundTunnels)
diff --git a/Tunnel.h b/Tunnel.h
index fe6022ac..43417e5d 100644
--- a/Tunnel.h
+++ b/Tunnel.h
@@ -73,7 +73,7 @@ namespace tunnel
 			
 			bool HandleTunnelBuildResponse (uint8_t * msg, size_t len);
 
-			virtual void Print (std::stringstream& s) const {};	
+			virtual void Print (std::stringstream&) const {};
 			
 			// implements TunnelBase
 			void SendTunnelDataMsg (std::shared_ptr<i2p::I2NPMessage> msg);