From 75b31b8dee39919165717091eec82d704e578315 Mon Sep 17 00:00:00 2001
From: john30 <ebusd@ebusd.eu>
Date: Sun, 5 Feb 2017 12:09:42 +0100
Subject: [PATCH] avoid unnecessary includes, avoid unnecessary casts, better
 initialization

---
 src/ebusd/bushandler.cpp  | 12 +-----------
 src/ebusd/bushandler.h    |  2 +-
 src/ebusd/datahandler.cpp |  4 ----
 3 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/src/ebusd/bushandler.cpp b/src/ebusd/bushandler.cpp
index 8445743b..27e2b28e 100644
--- a/src/ebusd/bushandler.cpp
+++ b/src/ebusd/bushandler.cpp
@@ -21,17 +21,7 @@
 #endif
 
 #include "ebusd/bushandler.h"
-#include <unistd.h>
-#include <time.h>
-#include <string>
-#include <vector>
-#include <deque>
-#include <cstring>
 #include <iomanip>
-#include "lib/ebus/message.h"
-#include "lib/ebus/data.h"
-#include "lib/ebus/result.h"
-#include "lib/ebus/symbol.h"
 #include "lib/utils/log.h"
 
 namespace ebusd {
@@ -995,7 +985,7 @@ void BusHandler::setScanFinished() {
 
 void BusHandler::formatScanResult(ostringstream& output) {
   if (m_runningScans > 0) {
-    output << static_cast<unsigned>(m_runningScans) << " scan(s) still running" << endl;
+    output << m_runningScans << " scan(s) still running" << endl;
   }
   bool first = true;
   for (unsigned char slave = 1; slave != 0; slave++) {  // 0 is known to be a master
diff --git a/src/ebusd/bushandler.h b/src/ebusd/bushandler.h
index 09ab45bd..ab321810 100644
--- a/src/ebusd/bushandler.h
+++ b/src/ebusd/bushandler.h
@@ -358,7 +358,7 @@ class BusHandler : public WaitThread {
       m_busLostRetries(busLostRetries), m_failedSendRetries(failedSendRetries),
       m_transferLatency(transferLatency), m_busAcquireTimeout(busAcquireTimeout), m_slaveRecvTimeout(slaveRecvTimeout),
       m_masterCount(device->isReadOnly()?0:1), m_autoLockCount(lockCount == 0),
-      m_lockCount(lockCount <= 3 ? 3 : lockCount), m_remainLockCount(m_autoLockCount),
+      m_lockCount(lockCount <= 3 ? 3 : lockCount), m_remainLockCount(m_autoLockCount ? 1 : 0),
       m_generateSynInterval(generateSyn ? SYN_TIMEOUT*getMasterNumber(ownAddress)+SYMBOL_DURATION : 0),
       m_pollInterval(pollInterval), m_lastReceive(0), m_lastPoll(0),
       m_currentRequest(NULL), m_runningScans(0), m_nextSendPos(0),
diff --git a/src/ebusd/datahandler.cpp b/src/ebusd/datahandler.cpp
index 30ce95d7..babe6419 100644
--- a/src/ebusd/datahandler.cpp
+++ b/src/ebusd/datahandler.cpp
@@ -21,16 +21,12 @@
 #endif
 
 #include "ebusd/datahandler.h"
-#include <list>
-#include <string>
 #ifdef HAVE_MQTT
 #  include "ebusd/mqtthandler.h"
 #endif
 
 namespace ebusd {
 
-using std::string;
-
 /** the final @a argp_child structure. */
 static const struct argp_child g_last_argp_child = {NULL, 0, NULL, 0};