Skip to content

Commit b6bc324

Browse files
broglep-workfabiobaltieri
authored andcommitted
net: lwm2m: rename path size define
Rename max path constant to prevent string length vs data size confusion Signed-off-by: Pascal Brogle <[email protected]>
1 parent b178ff5 commit b6bc324

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

include/zephyr/net/lwm2m.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1398,7 +1398,7 @@ void lwm2m_rd_client_update(void);
13981398
/**
13991399
* @brief LwM2M path maximum length
14001400
*/
1401-
#define LWM2M_MAX_PATH_STR_LEN sizeof("65535/65535/65535/65535")
1401+
#define LWM2M_MAX_PATH_STR_SIZE sizeof("65535/65535/65535/65535")
14021402

14031403
/**
14041404
* @brief Helper function to print path objects' contents to log

samples/net/lwm2m_client/src/lwm2m-client.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ static void rd_client_event(struct lwm2m_ctx *client,
283283
static void observe_cb(enum lwm2m_observe_event event,
284284
struct lwm2m_obj_path *path, void *user_data)
285285
{
286-
char buf[LWM2M_MAX_PATH_STR_LEN];
286+
char buf[LWM2M_MAX_PATH_STR_SIZE];
287287

288288
switch (event) {
289289

subsys/net/lib/lwm2m/lwm2m_obj_firmware.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ uint8_t lwm2m_firmware_get_update_state(void)
9797
void lwm2m_firmware_set_update_state_inst(uint16_t obj_inst_id, uint8_t state)
9898
{
9999
bool error = false;
100-
char path[LWM2M_MAX_PATH_STR_LEN];
100+
char path[LWM2M_MAX_PATH_STR_SIZE];
101101

102102
snprintk(path, sizeof(path), "%" PRIu16 "/%" PRIu16 "/%" PRIu16,
103103
LWM2M_OBJECT_FIRMWARE_ID, obj_inst_id, FIRMWARE_UPDATE_RESULT_ID);
@@ -164,7 +164,7 @@ void lwm2m_firmware_set_update_result_inst(uint16_t obj_inst_id, uint8_t result)
164164
{
165165
uint8_t state;
166166
bool error = false;
167-
char path[LWM2M_MAX_PATH_STR_LEN];
167+
char path[LWM2M_MAX_PATH_STR_SIZE];
168168

169169
/* Check LWM2M SPEC appendix E.6.1 */
170170
switch (result) {

subsys/net/lib/lwm2m/lwm2m_obj_swmgmt.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ static void *callback_read_not_defined(uint16_t obj_inst_id, uint16_t res_id, ui
205205
static void set_sw_update_state(struct lwm2m_swmgmt_data *instance, uint8_t state)
206206
{
207207
int ret;
208-
char obj_path[LWM2M_MAX_PATH_STR_LEN];
208+
char obj_path[LWM2M_MAX_PATH_STR_SIZE];
209209

210210
(void)snprintk(obj_path, sizeof(obj_path), "%d/%d/%d", LWM2M_OBJECT_SOFTWARE_MANAGEMENT_ID,
211211
instance->obj_inst_id, SWMGMT_UPDATE_STATE_ID);
@@ -218,7 +218,7 @@ static void set_sw_update_state(struct lwm2m_swmgmt_data *instance, uint8_t stat
218218
static void set_sw_update_result(struct lwm2m_swmgmt_data *instance, uint8_t result)
219219
{
220220
int ret;
221-
char obj_path[LWM2M_MAX_PATH_STR_LEN];
221+
char obj_path[LWM2M_MAX_PATH_STR_SIZE];
222222

223223
(void)snprintk(obj_path, sizeof(obj_path), "%d/%d/%d", LWM2M_OBJECT_SOFTWARE_MANAGEMENT_ID,
224224
instance->obj_inst_id, SWMGMT_UPDATE_RESULT_ID);
@@ -231,7 +231,7 @@ static void set_sw_update_result(struct lwm2m_swmgmt_data *instance, uint8_t res
231231
static void set_sw_update_act_state(struct lwm2m_swmgmt_data *instance, bool state)
232232
{
233233
int ret;
234-
char obj_path[LWM2M_MAX_PATH_STR_LEN];
234+
char obj_path[LWM2M_MAX_PATH_STR_SIZE];
235235

236236
(void)snprintk(obj_path, sizeof(obj_path), "%d/%d/%d", LWM2M_OBJECT_SOFTWARE_MANAGEMENT_ID,
237237
instance->obj_inst_id, SWMGMT_ACTIVATION_UPD_STATE_ID);

subsys/net/lib/lwm2m/lwm2m_observation.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@ static void engine_observe_node_init(struct observe_node *obs, const uint8_t *to
459459
static void remove_observer_path_from_list(struct lwm2m_ctx *ctx, struct observe_node *obs,
460460
struct lwm2m_obj_path_list *o_p, sys_snode_t *prev_node)
461461
{
462-
char buf[LWM2M_MAX_PATH_STR_LEN];
462+
char buf[LWM2M_MAX_PATH_STR_SIZE];
463463

464464
LOG_DBG("Removing observer %p for path %s", obs, lwm2m_path_log_buf(buf, &o_p->path));
465465
if (ctx->observe_cb) {
@@ -799,7 +799,7 @@ char *lwm2m_path_log_buf(char *buf, struct lwm2m_obj_path *path)
799799
#if defined(CONFIG_LWM2M_CANCEL_OBSERVE_BY_PATH)
800800
static int engine_remove_observer_by_path(struct lwm2m_ctx *ctx, struct lwm2m_obj_path *path)
801801
{
802-
char buf[LWM2M_MAX_PATH_STR_LEN];
802+
char buf[LWM2M_MAX_PATH_STR_SIZE];
803803
struct observe_node *obs;
804804
struct lwm2m_obj_path_list obs_path_list_buf;
805805
sys_slist_t lwm2m_path_list;

0 commit comments

Comments
 (0)