From 4c453a23543abe5fd1b970d08ff675c265a47ae3 Mon Sep 17 00:00:00 2001
From: John <ebusd@ebusd.eu>
Date: Sat, 14 Oct 2023 16:24:46 +0200
Subject: [PATCH] formatting

---
 src/ebusd/mainloop.cpp    |  3 ++-
 src/ebusd/mqtthandler.cpp | 14 ++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/ebusd/mainloop.cpp b/src/ebusd/mainloop.cpp
index f2b7e107..3d35a376 100644
--- a/src/ebusd/mainloop.cpp
+++ b/src/ebusd/mainloop.cpp
@@ -1095,9 +1095,10 @@ result_t MainLoop::executeWrite(const vector<string>& args, const string levels,
     if (!message->isWrite()) {
       return RESULT_ERR_INVALID_ARG;
     }
-    if (circuit.length() > 0 && circuit != message->getCircuit()) {
+    if (!circuit.empty() && circuit != message->getCircuit()) {
       return RESULT_ERR_INVALID_ARG;  // non-matching circuit
     }
+
     // send message
     SlaveSymbolString slave;
     ret = m_protocol->sendAndWait(master, &slave);
diff --git a/src/ebusd/mqtthandler.cpp b/src/ebusd/mqtthandler.cpp
index bd7aff72..51aedd84 100755
--- a/src/ebusd/mqtthandler.cpp
+++ b/src/ebusd/mqtthandler.cpp
@@ -841,18 +841,24 @@ void MqttHandler::run() {
           }
           if (includeActiveWrite) {
             if (message->isWrite()) {
-              bool skipMultiFieldWrite = (!m_hasDefinitionFieldsPayload || m_publishByField) && !message->isPassive() && message->getFieldCount() > 1;
+              bool skipMultiFieldWrite = (!m_hasDefinitionFieldsPayload || m_publishByField)
+              && !message->isPassive() && message->getFieldCount() > 1;
               if (skipMultiFieldWrite) {
-                continue;  // multi-field message is not writable when publishing by field or combining multiple fields in one definition, so skip it
+                // multi-field message is not writable when publishing by field or combining
+                // multiple fields in one definition, so skip it
+                continue;
               }
             } else {
               // check for existance of write message with same name
               Message* write = m_messages->find(message->getCircuit(), message->getName(), "", true);
               if (write) {
-                bool skipMultiFieldWrite = (!m_hasDefinitionFieldsPayload || m_publishByField) && write->getFieldCount() > 1;
+                bool skipMultiFieldWrite = (!m_hasDefinitionFieldsPayload || m_publishByField)
+                && write->getFieldCount() > 1;
                 if (!skipMultiFieldWrite) {
                   continue;  // avoid sending definition of read AND write message with the same key
-                }  // else: multi-field write message is not writable when publishing by field or combining multiple fields in one definition, so skip it
+                }
+                // else: multi-field write message is not writable when publishing by field or combining
+                // multiple fields in one definition, so skip it
               }
             }
           }