Reduce code duplication in client example

Some parts of the code were copy-and-pasted several times.
eclipse-wakaama · Sep 9, 2024 · 0b4b967 · 0b4b967
1 parent 4b8a3b9
commit 0b4b967
Showing 1 changed file with 16 additions and 36 deletions.
diff --git a/examples/client/object_connectivity_moni.c b/examples/client/object_connectivity_moni.c
@@ -86,6 +86,19 @@ typedef struct
     int linkUtilization;
 } conn_m_data_t;
 
+static void reduce_single_instance(lwm2m_data_t *dataP, lwm2m_data_t **subTlvP, size_t *count) {
+    if (dataP->type == LWM2M_TYPE_MULTIPLE_RESOURCE) {
+        (*count) = dataP->value.asChildren.count;
+        (*subTlvP) = dataP->value.asChildren.array;
+    } else {
+        (*count) = 1; // reduced to 1 instance to fit in one block size
+        (*subTlvP) = lwm2m_data_new((*count));
+        for (size_t i = 0; i < (*count); i++)
+            (*subTlvP)[i].id = i;
+        lwm2m_data_encode_instances((*subTlvP), (*count), dataP);
+    }
+}
+
 static uint8_t prv_set_value(lwm2m_data_t * dataP,
                              conn_m_data_t * connDataP)
 {
@@ -102,18 +115,7 @@ static uint8_t prv_set_value(lwm2m_data_t * dataP,
 
     case RES_M_AVL_NETWORK_BEARER:
     {
-        if (dataP->type == LWM2M_TYPE_MULTIPLE_RESOURCE)
-        {
-            count = dataP->value.asChildren.count;
-            subTlvP = dataP->value.asChildren.array;
-        }
-        else
-        {
-            count = 1; // reduced to 1 instance to fit in one block size
-            subTlvP = lwm2m_data_new(count);
-            for (i = 0; i < count; i++) subTlvP[i].id = i;
-            lwm2m_data_encode_instances(subTlvP, count, dataP);
-        }
+        reduce_single_instance(dataP, &subTlvP, &count);
 
         for (i = 0; i < count; i++)
         {
@@ -141,18 +143,7 @@ static uint8_t prv_set_value(lwm2m_data_t * dataP,
 
     case RES_M_IP_ADDRESSES:
     {
-        if (dataP->type == LWM2M_TYPE_MULTIPLE_RESOURCE)
-        {
-            count = dataP->value.asChildren.count;
-            subTlvP = dataP->value.asChildren.array;
-        }
-        else
-        {
-            count = 1; // reduced to 1 instance to fit in one block size
-            subTlvP = lwm2m_data_new(count);
-            for (i = 0; i < count; i++) subTlvP[i].id = i;
-            lwm2m_data_encode_instances(subTlvP, count, dataP);
-        }
+        reduce_single_instance(dataP, &subTlvP, &count);
 
         for (i = 0; i < count; i++)
         {
@@ -204,18 +195,7 @@ static uint8_t prv_set_value(lwm2m_data_t * dataP,
 
     case RES_O_APN:
     {
-        if (dataP->type == LWM2M_TYPE_MULTIPLE_RESOURCE)
-        {
-            count = dataP->value.asChildren.count;
-            subTlvP = dataP->value.asChildren.array;
-        }
-        else
-        {
-            count = 1; // reduced to 1 instance to fit in one block size
-            subTlvP = lwm2m_data_new(count);
-            for (i = 0; i < count; i++) subTlvP[i].id = i;
-            lwm2m_data_encode_instances(subTlvP, count, dataP);
-        }
+        reduce_single_instance(dataP, &subTlvP, &count);
 
         for (i = 0; i < count; i++)
         {