Skip to content

Commit

Permalink
Extract small function to set up resources in client example
Browse files Browse the repository at this point in the history
This removes a small duplication of the code.
  • Loading branch information
LukasWoodtli committed Sep 10, 2024
1 parent e6eec2d commit c8caaf2
Showing 1 changed file with 11 additions and 9 deletions.
20 changes: 11 additions & 9 deletions examples/client/object_server.c
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,11 @@

#include "liblwm2m.h"

#include <gmpxx.h>
#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <limits.h>

typedef struct _server_instance_
{
Expand Down Expand Up @@ -237,6 +238,13 @@ static void remove_optional_resource(uint16_t *resList, int val, int id, int *nb
}
}

static void setup_resources(lwm2m_data_t *const *dataArrayP, const uint16_t *resList, int nbRes) {
for (int i = 0; i < nbRes; i++)
{
(*dataArrayP)[i].id = resList[i];
}
}

static void remove_all_optional_resources(uint16_t *resList, server_instance_t *targetP, int *nbRes) {
remove_optional_resource(resList, targetP->registrationPriorityOrder, LWM2M_SERVER_REG_ORDER_ID, nbRes);
remove_optional_resource(resList, targetP->initialRegistrationDelayTimer, LWM2M_SERVER_INITIAL_REG_DELAY_ID, nbRes);
Expand Down Expand Up @@ -303,10 +311,7 @@ static uint8_t prv_server_read(lwm2m_context_t *contextP,
*dataArrayP = lwm2m_data_new(nbRes);
if (*dataArrayP == NULL) return COAP_500_INTERNAL_SERVER_ERROR;
*numDataP = nbRes;
for (i = 0 ; i < nbRes ; i++)
{
(*dataArrayP)[i].id = resList[i];
}
setup_resources(dataArrayP, resList, nbRes)
}

result = prv_get_all_values(numDataP, dataArrayP, targetP);
Expand Down Expand Up @@ -359,10 +364,7 @@ static uint8_t prv_server_discover(lwm2m_context_t *contextP,
*dataArrayP = lwm2m_data_new(nbRes);
if (*dataArrayP == NULL) return COAP_500_INTERNAL_SERVER_ERROR;
*numDataP = nbRes;
for (i = 0; i < nbRes; i++)
{
(*dataArrayP)[i].id = resList[i];
}
setup_resources(dataArrayP, resList, nbRes);
}
else
{
Expand Down

0 comments on commit c8caaf2

Please sign in to comment.