From 2320ba3a69723baa23ed1ab1ab2c09bf8a9202d7 Mon Sep 17 00:00:00 2001
From: Martin Preuss <martin@aquamaniac.de>
Date: Tue, 18 Mar 2025 22:51:49 +0100
Subject: [PATCH] aqhome-data: fixed a bug (don't need tagList for
 "GetValues").

---
 apps/aqhome-data/s_getvalues.c | 94 +++++++++++++++++-----------------
 1 file changed, 46 insertions(+), 48 deletions(-)

diff --git a/apps/aqhome-data/s_getvalues.c b/apps/aqhome-data/s_getvalues.c
index 64567a5..8fe4477 100644
--- a/apps/aqhome-data/s_getvalues.c
+++ b/apps/aqhome-data/s_getvalues.c
@@ -49,58 +49,56 @@ static void _sendValueList(AQH_OBJECT *ep, const AQH_VALUE_LIST *vl, uint32_t fl
 
 void AqHomeDataServer_HandleGetValues(AQH_OBJECT *o, AQH_OBJECT *ep, const AQH_MESSAGE *msg, const GWEN_TAG16_LIST *tagList)
 {
-  if (tagList) {
-    AQHOME_SERVER *xo;
-  
-    xo=AqHomeDataServer_GetServerData(o);
-    if (xo) {
-      const AQH_VALUE_LIST *origValueList;
-  
-      uint32_t refMsgId;
-  
-      refMsgId=AQH_IpcMessage_GetMsgId(msg);
-  
-      DBG_INFO(NULL, "HandleGetValues");
-      origValueList=AQH_Storage_GetValueList(xo->storage);
-      if (origValueList) {
-        DBG_INFO(NULL, "Have a list of %d values", AQH_Value_List_GetCount(origValueList));
-        if (AQH_Value_List_GetCount(origValueList)<AQHOMEDATA_VALUESPERMSG) {
-          DBG_INFO(NULL, "Sending all entries in one message");
-          _sendValueList(ep, origValueList, AQH_MSGDATA_VALUES_FLAGS_LASTMSG, refMsgId);
-        }
-        else {
-          AQH_VALUE_LIST *tmpValueList;
-          const AQH_VALUE *v;
-    
-          DBG_INFO(NULL, "Sending entries in multiple messages");
-          tmpValueList=AQH_Value_List_new();
-          v=AQH_Value_List_First(origValueList);
-          while(v) {
-            const AQH_VALUE *next;
-            AQH_VALUE *copyOfValue;
-    
-            next=AQH_Value_List_Next(v);
-            copyOfValue=AQH_Value_dup(v);
-            AQH_Value_List_Add(copyOfValue, tmpValueList);
-            if (AQH_Value_List_GetCount(tmpValueList)>=AQHOMEDATA_VALUESPERMSG) {
-              DBG_INFO(NULL, "Sending %d values", AQH_Value_List_GetCount(tmpValueList));
-              _sendValueList(ep, tmpValueList, next?0:AQH_MSGDATA_VALUES_FLAGS_LASTMSG, refMsgId);
-              AQH_Value_List_Clear(tmpValueList);
-            }
-            v=next;
-          }
-          if (AQH_Value_List_GetCount(tmpValueList)) {
-            DBG_INFO(NULL, "Sending %d values", AQH_Value_List_GetCount(tmpValueList));
-            _sendValueList(ep, tmpValueList, AQH_MSGDATA_VALUES_FLAGS_LASTMSG, refMsgId); /* send remaining */
-          }
-          AQH_Value_List_free(tmpValueList);
-        }
+  AQHOME_SERVER *xo;
+
+  xo=AqHomeDataServer_GetServerData(o);
+  if (xo) {
+    const AQH_VALUE_LIST *origValueList;
+
+    uint32_t refMsgId;
+
+    refMsgId=AQH_IpcMessage_GetMsgId(msg);
+
+    DBG_INFO(NULL, "HandleGetValues");
+    origValueList=AQH_Storage_GetValueList(xo->storage);
+    if (origValueList) {
+      DBG_INFO(NULL, "Have a list of %d values", AQH_Value_List_GetCount(origValueList));
+      if (AQH_Value_List_GetCount(origValueList)<AQHOMEDATA_VALUESPERMSG) {
+        DBG_INFO(NULL, "Sending all entries in one message");
+        _sendValueList(ep, origValueList, AQH_MSGDATA_VALUES_FLAGS_LASTMSG, refMsgId);
       }
       else {
-        /* empty list */
-        _sendValueList(ep, NULL, AQH_MSGDATA_VALUES_FLAGS_LASTMSG, refMsgId);
+        AQH_VALUE_LIST *tmpValueList;
+        const AQH_VALUE *v;
+  
+        DBG_INFO(NULL, "Sending entries in multiple messages");
+        tmpValueList=AQH_Value_List_new();
+        v=AQH_Value_List_First(origValueList);
+        while(v) {
+          const AQH_VALUE *next;
+          AQH_VALUE *copyOfValue;
+  
+          next=AQH_Value_List_Next(v);
+          copyOfValue=AQH_Value_dup(v);
+          AQH_Value_List_Add(copyOfValue, tmpValueList);
+          if (AQH_Value_List_GetCount(tmpValueList)>=AQHOMEDATA_VALUESPERMSG) {
+            DBG_INFO(NULL, "Sending %d values", AQH_Value_List_GetCount(tmpValueList));
+            _sendValueList(ep, tmpValueList, next?0:AQH_MSGDATA_VALUES_FLAGS_LASTMSG, refMsgId);
+            AQH_Value_List_Clear(tmpValueList);
+          }
+          v=next;
+        }
+        if (AQH_Value_List_GetCount(tmpValueList)) {
+          DBG_INFO(NULL, "Sending %d values", AQH_Value_List_GetCount(tmpValueList));
+          _sendValueList(ep, tmpValueList, AQH_MSGDATA_VALUES_FLAGS_LASTMSG, refMsgId); /* send remaining */
+        }
+        AQH_Value_List_free(tmpValueList);
       }
     }
+    else {
+      /* empty list */
+      _sendValueList(ep, NULL, AQH_MSGDATA_VALUES_FLAGS_LASTMSG, refMsgId);
+    }
   }
 }