From b6bc324a1d8733f39e1583bf8946d3e5e699b2bc Mon Sep 17 00:00:00 2001 From: Pascal Brogle Date: Tue, 10 Jan 2023 18:05:41 +0100 Subject: [PATCH] net: lwm2m: rename path size define Rename max path constant to prevent string length vs data size confusion Signed-off-by: Pascal Brogle --- include/zephyr/net/lwm2m.h | 2 +- samples/net/lwm2m_client/src/lwm2m-client.c | 2 +- subsys/net/lib/lwm2m/lwm2m_obj_firmware.c | 4 ++-- subsys/net/lib/lwm2m/lwm2m_obj_swmgmt.c | 6 +++--- subsys/net/lib/lwm2m/lwm2m_observation.c | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/zephyr/net/lwm2m.h b/include/zephyr/net/lwm2m.h index 5b5e3a1af1b..92215441d49 100644 --- a/include/zephyr/net/lwm2m.h +++ b/include/zephyr/net/lwm2m.h @@ -1398,7 +1398,7 @@ void lwm2m_rd_client_update(void); /** * @brief LwM2M path maximum length */ -#define LWM2M_MAX_PATH_STR_LEN sizeof("65535/65535/65535/65535") +#define LWM2M_MAX_PATH_STR_SIZE sizeof("65535/65535/65535/65535") /** * @brief Helper function to print path objects' contents to log diff --git a/samples/net/lwm2m_client/src/lwm2m-client.c b/samples/net/lwm2m_client/src/lwm2m-client.c index 6143d8b28ea..3d0045b7aa8 100644 --- a/samples/net/lwm2m_client/src/lwm2m-client.c +++ b/samples/net/lwm2m_client/src/lwm2m-client.c @@ -283,7 +283,7 @@ static void rd_client_event(struct lwm2m_ctx *client, static void observe_cb(enum lwm2m_observe_event event, struct lwm2m_obj_path *path, void *user_data) { - char buf[LWM2M_MAX_PATH_STR_LEN]; + char buf[LWM2M_MAX_PATH_STR_SIZE]; switch (event) { diff --git a/subsys/net/lib/lwm2m/lwm2m_obj_firmware.c b/subsys/net/lib/lwm2m/lwm2m_obj_firmware.c index 8db7efb9bbd..ac0fe290ce3 100644 --- a/subsys/net/lib/lwm2m/lwm2m_obj_firmware.c +++ b/subsys/net/lib/lwm2m/lwm2m_obj_firmware.c @@ -97,7 +97,7 @@ uint8_t lwm2m_firmware_get_update_state(void) void lwm2m_firmware_set_update_state_inst(uint16_t obj_inst_id, uint8_t state) { bool error = false; - char path[LWM2M_MAX_PATH_STR_LEN]; + char path[LWM2M_MAX_PATH_STR_SIZE]; snprintk(path, sizeof(path), "%" PRIu16 "/%" PRIu16 "/%" PRIu16, 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) { uint8_t state; bool error = false; - char path[LWM2M_MAX_PATH_STR_LEN]; + char path[LWM2M_MAX_PATH_STR_SIZE]; /* Check LWM2M SPEC appendix E.6.1 */ switch (result) { diff --git a/subsys/net/lib/lwm2m/lwm2m_obj_swmgmt.c b/subsys/net/lib/lwm2m/lwm2m_obj_swmgmt.c index 1855df3929d..a7f95af74ba 100644 --- a/subsys/net/lib/lwm2m/lwm2m_obj_swmgmt.c +++ b/subsys/net/lib/lwm2m/lwm2m_obj_swmgmt.c @@ -205,7 +205,7 @@ static void *callback_read_not_defined(uint16_t obj_inst_id, uint16_t res_id, ui static void set_sw_update_state(struct lwm2m_swmgmt_data *instance, uint8_t state) { int ret; - char obj_path[LWM2M_MAX_PATH_STR_LEN]; + char obj_path[LWM2M_MAX_PATH_STR_SIZE]; (void)snprintk(obj_path, sizeof(obj_path), "%d/%d/%d", LWM2M_OBJECT_SOFTWARE_MANAGEMENT_ID, 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 static void set_sw_update_result(struct lwm2m_swmgmt_data *instance, uint8_t result) { int ret; - char obj_path[LWM2M_MAX_PATH_STR_LEN]; + char obj_path[LWM2M_MAX_PATH_STR_SIZE]; (void)snprintk(obj_path, sizeof(obj_path), "%d/%d/%d", LWM2M_OBJECT_SOFTWARE_MANAGEMENT_ID, 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 static void set_sw_update_act_state(struct lwm2m_swmgmt_data *instance, bool state) { int ret; - char obj_path[LWM2M_MAX_PATH_STR_LEN]; + char obj_path[LWM2M_MAX_PATH_STR_SIZE]; (void)snprintk(obj_path, sizeof(obj_path), "%d/%d/%d", LWM2M_OBJECT_SOFTWARE_MANAGEMENT_ID, instance->obj_inst_id, SWMGMT_ACTIVATION_UPD_STATE_ID); diff --git a/subsys/net/lib/lwm2m/lwm2m_observation.c b/subsys/net/lib/lwm2m/lwm2m_observation.c index f44fb0497f7..c20f9b5fce4 100644 --- a/subsys/net/lib/lwm2m/lwm2m_observation.c +++ b/subsys/net/lib/lwm2m/lwm2m_observation.c @@ -459,7 +459,7 @@ static void engine_observe_node_init(struct observe_node *obs, const uint8_t *to static void remove_observer_path_from_list(struct lwm2m_ctx *ctx, struct observe_node *obs, struct lwm2m_obj_path_list *o_p, sys_snode_t *prev_node) { - char buf[LWM2M_MAX_PATH_STR_LEN]; + char buf[LWM2M_MAX_PATH_STR_SIZE]; LOG_DBG("Removing observer %p for path %s", obs, lwm2m_path_log_buf(buf, &o_p->path)); if (ctx->observe_cb) { @@ -799,7 +799,7 @@ char *lwm2m_path_log_buf(char *buf, struct lwm2m_obj_path *path) #if defined(CONFIG_LWM2M_CANCEL_OBSERVE_BY_PATH) static int engine_remove_observer_by_path(struct lwm2m_ctx *ctx, struct lwm2m_obj_path *path) { - char buf[LWM2M_MAX_PATH_STR_LEN]; + char buf[LWM2M_MAX_PATH_STR_SIZE]; struct observe_node *obs; struct lwm2m_obj_path_list obs_path_list_buf; sys_slist_t lwm2m_path_list;